Changeset 2276Tweet

Timestamp:

Jan 25, 2013, 2:38:46 PM (10 years ago)

Author:

sam

Message:

build: revert the weak symbol work; it confuses Visual Studio too much.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/core.h (modified) (1 diff)
• src/platform/sdl/sdlapp.cpp (modified) (2 diffs)
• test/math/Makefile.am (modified) (1 diff)
• test/testsuite.cpp (modified) (1 diff)

trunk/configure.ac

@@ -198 +198 @@
  [AC_MSG_RESULT(yes)
   CXXFLAGS="${CXXFLAGS} -mwindows -mwin32"
-  dnl  If we come across these symbols, try to link them
-  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16 -u_SDL_main"],
+  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"],
  [AC_MSG_RESULT(no)])
 LIBS="$LIBS_save"

trunk/src/core.h

@@ -69 +69 @@
 #endif
 
-/* If using SDL, let it override main() but immediately replace
- * 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
+/* If using SDL on Windows or OS X, let it override main() */
+#if defined USE_SDL && (defined _WIN32 || defined __APPLE__)
 #   include <SDL_main.h>
-#   if defined main && !LOL_DONT_DIVERT_MAIN
-#       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

@@ -12 +12 @@
 #   include "config.h"
 #endif
-
-/* This instructs our headers to let SDL override the "main"
- * symbol using its macros. */
-#define LOL_DONT_DIVERT_MAIN 1
 
 #if defined USE_SDL
@@ -40 +36 @@
 HWND g_hwnd = NULL;
 extern IDirect3DDevice9 *g_d3ddevice;
-#endif
-
-#if defined main
-#   if defined _MSC_VER
-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
-int lol_sdl_main() __attribute__((weak));
-int lol_sdl_main(int argc, char **argv) __attribute__((weak));
-int lol_sdl_main(int argc, char **argv, char **envp) __attribute__((weak));
-#       define WRAPPER lol_sdl_main
-#   endif
-
-/* One of these wrappers will be overridden by the user's version */
-
-int WRAPPER() { return 0; }
-int WRAPPER(int argc, char **argv) { return 0; }
-int WRAPPER(int argc, char **argv, char **envp) { return 0; }
-
-int main(int argc, char *argv[])
-{
-    int ret = 0;
-    ret += lol_sdl_main();
-    ret += lol_sdl_main(argc, argv);
-    ret += lol_sdl_main(argc, argv, NULL);
-    return ret;
-}
 #endif
 

trunk/test/math/Makefile.am

@@ -10 +10 @@
 pi_SOURCES = pi.cpp
 pi_CPPFLAGS = @LOL_CFLAGS@
-pi_LDFLAGS = -u_SDL_main -uSDL_main $(top_builddir)/src/liblol.a @LOL_LIBS@
+pi_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 pi_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

trunk/test/testsuite.cpp

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