diff --git a/src/panda_sdl/main.cpp b/src/panda_sdl/main.cpp index 93c8aa5a..a832430f 100644 --- a/src/panda_sdl/main.cpp +++ b/src/panda_sdl/main.cpp @@ -14,6 +14,7 @@ int emu_main(int argc, char *argv[]) { } app.run(); + return 0; } int main(int argc, char *argv[]) { @@ -23,8 +24,8 @@ int main(int argc, char *argv[]) { #ifdef __WINRT__ #include "SDL.h" -int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR argv, int argc) +int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) { - return SDL_WinRTRunApp(emu_main, NULL); + return SDL_WinRTRunApp(emu_main, nullptr); } #endif \ No newline at end of file diff --git a/uwp/deps/bin/libgcc_s_seh-1.dll b/uwp/deps/bin/libgcc_s_seh-1.dll new file mode 100644 index 00000000..cf563318 Binary files /dev/null and b/uwp/deps/bin/libgcc_s_seh-1.dll differ diff --git a/uwp/deps/bin/libstdc++-6.dll b/uwp/deps/bin/libstdc++-6.dll new file mode 100644 index 00000000..82f9ae11 Binary files /dev/null and b/uwp/deps/bin/libstdc++-6.dll differ diff --git a/uwp/deps/bin/libwinpthread-1.dll b/uwp/deps/bin/libwinpthread-1.dll new file mode 100644 index 00000000..cea16951 Binary files /dev/null and b/uwp/deps/bin/libwinpthread-1.dll differ diff --git a/uwp/mingw_uwp_module.cmake b/uwp/mingw_uwp_module.cmake index 4edd2bc6..a9d5c8a7 100644 --- a/uwp/mingw_uwp_module.cmake +++ b/uwp/mingw_uwp_module.cmake @@ -118,7 +118,7 @@ function(_mingw_uwp_setup_impl target) if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|AMD64") target_compile_options(${target} PRIVATE -mcx16) endif() - target_link_options(${target} PRIVATE -municode -static) + target_link_options(${target} PRIVATE -municode) if(NOT MINGW_WINRT_UNCAGED) set(_prev_required_flags "${CMAKE_REQUIRED_FLAGS}")