From 59c11e5309f00e5f0b444792b5521371c693c62d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 11 Nov 2023 21:43:13 -0600 Subject: [PATCH] [nostalgia] Make Windows builds of player and studio WIN32 apps --- src/nostalgia/player/CMakeLists.txt | 2 +- src/nostalgia/player/main.cpp | 4 ++++ src/nostalgia/studio/CMakeLists.txt | 2 +- src/nostalgia/studio/main.cpp | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/player/CMakeLists.txt b/src/nostalgia/player/CMakeLists.txt index 06dced64..45412f44 100644 --- a/src/nostalgia/player/CMakeLists.txt +++ b/src/nostalgia/player/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable( - nostalgia + nostalgia WIN32 app.cpp main.cpp ) diff --git a/src/nostalgia/player/main.cpp b/src/nostalgia/player/main.cpp index 46c603e7..9cff5386 100644 --- a/src/nostalgia/player/main.cpp +++ b/src/nostalgia/player/main.cpp @@ -26,7 +26,11 @@ static ox::Error run(int argc, const char **argv) noexcept { return run(std::move(fs)); } +#ifdef _WIN32 +int WinMain(int argc, const char **argv) { +#else int main(int argc, const char **argv) { +#endif #if defined(DEBUG) && !defined(OX_BARE_METAL) ox::LoggerConn loggerConn; const auto loggerErr = loggerConn.initConn("Nostalgia Player"); diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index 167ab738..66165ed6 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_executable( - nostalgia-studio MACOSX_BUNDLE + nostalgia-studio WIN32 MACOSX_BUNDLE main.cpp ) diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp index 8523df5c..0b0b6964 100644 --- a/src/nostalgia/studio/main.cpp +++ b/src/nostalgia/studio/main.cpp @@ -7,7 +7,11 @@ #include +#ifdef _WIN32 +int WinMain(int argc, const char **argv) { +#else int main(int argc, const char **argv) { +#endif nostalgia::registerKeelModules(); nostalgia::registerStudioModules(); return studio::main("Nostalgia Studio", ".nostalgia", argc, argv);