diff --git a/configure.ac b/configure.ac
index 40e4d7ee..7cecc2c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,11 +125,12 @@ AM_CONDITIONAL(USE_PS3, test "${ac_cv_my_have_ps3}" != "no")
 
 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"
 
@@ -263,6 +264,8 @@ AC_CHECK_HEADERS(SDL_image.h, [ac_cv_my_have_sdl_image="yes"])
 AC_CHECK_LIB(SDL, main,
  [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"],
  [ac_cv_my_have_sdl_mixer="no"])
diff --git a/src/core.h b/src/core.h
index 00145d9f..0ec6f9c4 100644
--- a/src/core.h
+++ b/src/core.h
@@ -66,8 +66,8 @@ static inline int isnan(float f)
 #   define main lol_nacl_main
 #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