Changeset 1653Tweet

Timestamp:

Jul 19, 2012, 7:07:37 PM (10 years ago)

Author:

sam

Message:

build: add libSDLmain.a binaries for GUI MinGW builds; the provided static
libraries only work with the Visual Studio runtime.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• contrib/NOTES (modified) (1 diff)
• contrib/sdl-1.2.15/lib/i686-w64-mingw32/libSDLmain.a (added)
• contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/libSDLmain.a (added)
• src/core.h (modified) (1 diff)

trunk/configure.ac

@@ -126 +126 @@
 dnl  Are we building using MinGW?
 LIBS_save="$LIBS"
-LIBS="$LIBS -mwindows"
-AC_MSG_CHECKING(for -mwindows)
+LIBS="$LIBS -mwindows -mwin32"
+AC_MSG_CHECKING(for -mwindows -mwin32)
 AC_TRY_LINK([], [],
  [AC_MSG_RESULT(yes)
-  LOL_LIBS="${LOL_LIBS} -mwindows"],
+  CXXFLAGS="${CXXFLAGS} -mwindows -mwin32"
+  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"],
  [AC_MSG_RESULT(no)])
 LIBS="$LIBS_save"
@@ -264 +265 @@
  [SDL_LIBS="${SDL_LIBS} -lSDL"],
  [ac_cv_my_have_sdl="no"])
+AC_CHECK_LIB(SDLmain, main,
+ [SDL_LIBS="${SDL_LIBS} -lSDLmain -lSDL"])
 AC_CHECK_LIB(SDL_mixer, main,
  [SDLMIXER_LIBS="${SDLMIXER_LIBS} -lSDL_mixer"],

trunk/contrib/NOTES

@@ -39 +39 @@
 Download page: http://www.libsdl.org/release/
 
-Just take the pre-compiled binaries from upstream (for VC). For other
-ways to build SDL, see older versions of this document.
+- take the pre-compiled binaries for Visual C++
+- take the pre-compiled libSDLmain.a for 32-bit mingw32
+
+- download the source and build libSDLmain.a for 64-bit mingw32
+  (note: CPPFLAGS=-D_CRTIMP= used to be needed)
+
+    ./configure --host=x86_64-w64-mingw32
+    make build/libSDLmain.la
+
+- copy build/.libs/libSDLmain.a
 
 

trunk/src/core.h

@@ -67 +67 @@
 #endif
 
-/* If using SDL and Visual Studio, let it override main() */
-#if defined USE_SDL && (defined _MSC_VER || defined __APPLE__)
+/* If using SDL on Windows or OS X, let it override main() */
+#if defined USE_SDL && (defined _WIN32 || defined __APPLE__)
 #   include <SDL_main.h>
 #endif