Changeset 2274Tweet

Timestamp:

Jan 25, 2013, 1:35:24 PM (10 years ago)

Author:

sam

Message:

build: provide weak symbols for lol_sdl_main on Visual Studio.

Location:

trunk

Files:

• src/core.h (modified) (2 diffs)
• src/platform/sdl/sdlapp.cpp (modified) (3 diffs)
• test/testsuite.cpp (modified) (1 diff)

trunk/src/core.h

@@ -70 +70 @@
 
 /* If using SDL, let it override main() but immediately replace
- * the override with ours. */
+ * the override with ours, then declare weak symbols to ensure one
+ * of our dummy functions gets replaced by the user's main(). */
 #if defined USE_SDL
 #   include <SDL_main.h>
@@ -76 +77 @@
 #       undef main
 #       define main lol_sdl_main
+#       if defined _MSC_VER
+int lol_sdl_main();
+int lol_sdl_main_msvc();
+#pragma comment(linker, "/alternatename:?lol_sdl_main@@YAHXZ" \
+                                      "=?lol_sdl_main_msvc@@YAHXZ")
+int lol_sdl_main(int argc, char **argv);
+int lol_sdl_main_msvc(int argc, char **argv);
+#pragma comment(linker, "/alternatename:?lol_sdl_main@@YAHHPEAPEAD@Z" \
+                                      "=?lol_sdl_main_msvc@@YAHHPEAPEAD@Z")
+int lol_sdl_main(int argc, char **argv, char **envp);
+int lol_sdl_main_msvc(int argc, char **argv, char **envp);
+#pragma comment(linker, "/alternatename:?lol_sdl_main@@YAHHPEAPEAD0@Z" \
+                                      "=?lol_sdl_main_msvc@@YAHHPEAPEAD0@Z")
+#       endif
 #   endif
 #endif

trunk/src/platform/sdl/sdlapp.cpp

@@ -44 +44 @@
 #if defined main
 #   if defined _MSC_VER
-#       pragma comment(linker, "/alternatename:_lol_sdl_main=_lol_sdl_main_msvc")
+int lol_sdl_main();
+int lol_sdl_main(int argc, char **argv);
+int lol_sdl_main(int argc, char **argv, char **envp);
 #       define WRAPPER lol_sdl_main_msvc
 #   else
@@ -54 +56 @@
 
 /* One of these wrappers will be overridden by the user's version */
+
 int WRAPPER() { return 0; }
 int WRAPPER(int argc, char **argv) { return 0; }
@@ -60 +63 @@
 int main(int argc, char *argv[])
 {
-printf("LOL OK\n");
     int ret = 0;
     ret += lol_sdl_main();

trunk/test/testsuite.cpp

@@ -20 +20 @@
 #include <lol/unit.h>
 
-int main(int argc, char **argv)
+int main()
 {
     lol::TextTestRunner runner;