Merge commit '4ccdfc3a6e5bd501968903a01f7d8141b6f88375'

src/nostalgia/modules/core/src/keel/keelmodule.cpp

@@ -92,7 +92,7 @@ static class: public keel::Module {
 				},
 			};
 		}
-} mod;
+} const mod;
 
 keel::Module const*keelModule() noexcept {
 	return &mod;

src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp

@@ -258,7 +258,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 	}
 	if (newName) {
 		std::ignore = pushCommand<UpdateColorInfoCommand>(
-				m_pal, m_selectedColorRow, ox::String{newName});
+				m_pal, m_selectedColorRow, static_cast<ox::String>(newName.text));
 	}
 }
 

src/nostalgia/modules/core/src/studio/studiomodule.cpp

@@ -25,7 +25,7 @@ static class: public studio::Module {
 		out.emplace_back(ox::make<studio::ItemMakerT<core::Palette>>("Palette", "Palettes", FileExt_npal));
 		return out;
 	}
-} mod;
+} const mod;
 
 const studio::Module *studioModule() noexcept {
 	return &mod;

src/olympic/applib/applib.cpp

@@ -50,7 +50,7 @@ void registerKeelModules() noexcept;
 void registerStudioModules() noexcept;
 }
 
-#ifdef _WIN32
+#if defined(_WIN32) && OLYMPIC_GUI_APP
 int WinMain() {
 	auto const argc = __argc;
 	auto const argv = const_cast<const char**>(__argv);

src/olympic/studio/applib/src/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(
 )
 target_compile_definitions(
 	StudioAppLib PUBLIC
+		OLYMPIC_GUI_APP=1
 		OLYMPIC_LOAD_STUDIO_MODULES=1
 		OLYMPIC_APP_NAME="Studio"
 )