[nostalgia/studio] Update version to d2025.02.0

deps/buildcore/scripts/file-to-cpp.py

@@ -1,30 +0,0 @@
-#! /usr/bin/env python3
-
-#
-#  Copyright 2016 - 2025 gary@drinkingtea.net
-#
-#  This Source Code Form is subject to the terms of the Mozilla Public
-#  License, v. 2.0. If a copy of the MPL was not distributed with this
-#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-import argparse
-import sys
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--file', help='path to file')
-    parser.add_argument('--out-cpp', help='path to output cpp file')
-    parser.add_argument('--out-hpp', help='path to output hpp file')
-    parser.add_argument('--namespace', help='path to output hpp file')
-    args = parser.parse_args()
-    return 0
-
-
-if __name__ == '__main__':
-    try:
-        err = main()
-        sys.exit(err)
-    except KeyboardInterrupt:
-        sys.exit(1)

src/nostalgia/player/app.cpp

@@ -134,6 +134,7 @@ ox::Error run(
 		return ox::Error{1, "Please provide path to project directory or OxFS file."};
 	}
 	auto const path = args[1];
-	OX_REQUIRE_M(tctx, turbine::init(path, project));
+	OX_REQUIRE_M(fs, keel::loadRomFs(path));
+	OX_REQUIRE_M(tctx, turbine::init(std::move(fs), project));
 	return runTileSheetSetTest(*tctx);
 }

src/nostalgia/studio/CMakeLists.txt

@@ -1,7 +1,4 @@
-add_executable(
-	NostalgiaStudio WIN32 MACOSX_BUNDLE
-		ns.rc
-)
+add_executable(NostalgiaStudio WIN32 MACOSX_BUNDLE)
 
 target_link_libraries(
 	NostalgiaStudio
@@ -14,7 +11,7 @@ target_link_libraries(
 
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
-		OLYMPIC_APP_VERSION="dev build"
+		OLYMPIC_APP_VERSION="d2025.02.0"
 )
 
 install(

src/nostalgia/studio/Info.plist

@@ -18,7 +18,7 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>dev build</string>
+	<string>d2025.02.0</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>12.0.0</string>

src/nostalgia/studio/ns.rc

@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "ns_logo.ico"

src/olympic/keel/include/keel/media.hpp

@@ -68,7 +68,7 @@ constexpr auto makeLoader(Context &ctx) {
 		if (!beginsWith(assetId, "/")) {
 			auto const p = ctx.uuidToPath.at(assetId);
 			if (p.error) {
-				oxErrf("Could not find asset: {}\n", assetId);
+				oxErrf("Could not find asset: {}", assetId);
 				return ox::Error{1, "Asset ID not found"};
 			}
 			assetId = *p.value;

src/olympic/studio/applib/src/studioui.cpp

@@ -254,7 +254,6 @@ void StudioUI::drawTabs() noexcept {
 		if (!open) {
 			if (e->unsavedChanges()) {
 				m_closeFileConfirm.open();
-				++it;
 			} else {
 				e->close();
 				if (m_activeEditor == (*it).get()) {