Correct WinMain issues with SDL

pthom · Nov 29, 2023 · aa7d1e0 · aa7d1e0
1 parent 8b58436
commit aa7d1e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/hello_imgui/CMakeLists.txt b/src/hello_imgui/CMakeLists.txt
@@ -178,6 +178,9 @@ endif()
 if (IOS OR (MACOSX AND NOT HELLOIMGUI_MACOS_NO_BUNDLE))
     target_compile_definitions(${target_name} PUBLIC HELLOIMGUI_INSIDE_APPLE_BUNDLE)
 endif()
+if (HELLOIMGUI_WIN32_AUTO_WINMAIN)
+    target_compile_definitions(${target_name} PUBLIC HELLOIMGUI_WIN32_AUTO_WINMAIN)
+endif()
 
 # install
 if (PROJECT_IS_TOP_LEVEL AND NOT IOS AND NOT ANDROID)

diff --git a/src/hello_imgui/hello_imgui.h b/src/hello_imgui/hello_imgui.h
@@ -14,7 +14,14 @@
 #include <cstdint>
 
 #ifdef HELLOIMGUI_USE_SDL_OPENGL3
-#include <SDL.h>  // So that SDL can surreptitiously define its own main...
+    // Let SDL redefine main under iOS and co., but not under Windows, where we redefine WinMain
+    #ifdef _WIN32
+        #ifndef HELLOIMGUI_WIN32_AUTO_WINMAIN
+            #include <SDL.h>
+        #endif
+    #else
+        #include <SDL.h>
+    #endif
 #endif
 
 struct ImGuiTestEngine;