build: hide the SDL_main.h inclusion in core.h, and only activate it

on Windows if using Visual Studio; if using MinGW, try to stick to the
original main() entry point.

configure.ac

@@ -123,6 +123,17 @@ AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
 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)
+AC_TRY_LINK([], [],
+ [AC_MSG_RESULT(yes)
+  LOL_LIBS="${LOL_LIBS} -mwindows"],
+ [AC_MSG_RESULT(no)])
+LIBS="$LIBS_save"
+
+
 dnl  Are we on the Xbox 360?
 dnl  Answer: NO! we don't know how to build for it anyway
 AM_CONDITIONAL(USE_X360, false)
@@ -142,8 +153,7 @@ LIBS_save="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,OpenGL"
 AC_MSG_CHECKING(for -framework OpenGL)
 AC_TRY_LINK([], [],
- [ac_cv_my_have_cocoa="yes"
-  AC_MSG_RESULT(yes)
+ [AC_MSG_RESULT(yes)
   GL_LIBS="${GL_LIBS} -framework OpenGL"
   CXXFLAGS="${CXXFLAGS} -ObjC++"],
  [AC_MSG_RESULT(no)])

src/core.h

@@ -61,11 +61,16 @@ static inline int isnan(float f)
 }
 #endif
 
-/* If using NaCl, override main with our version */
+/* If using NaCl, override main() with our version */
 #if defined __native_client__
 #   define main lol_nacl_main
 #endif
 
+/* If using SDL and Visual Studio, let it override main() */
+#if defined _MSVC && defined USE_SDL
+#   include <SDL_main.h>
+#endif
+
 // Base types
 #include "lol/debug.h"
 #include "lol/math/math.h"

test/BtPhysTest.cpp

@@ -28,10 +28,6 @@
 #   include <cmath>
 #endif
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "core.h"
 #include "loldebug.h"
 

test/benchsuite.cpp

@@ -14,10 +14,6 @@
 
 #include <cstdio>
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "core.h"
 
 using namespace std;

test/debug/quad.cpp

@@ -19,10 +19,6 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 int main(int argc, char **argv)
 {
     Application app("Quad", ivec2(640, 480), 60.0f);

test/math/pi.cpp

@@ -14,10 +14,6 @@
 
 #include <cstdio>
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "core.h"
 
 using std::printf;

test/math/poly.cpp

@@ -14,10 +14,6 @@
 
 #include <cstdio>
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "core.h"
 
 using namespace lol;

test/math/remez.cpp

@@ -12,10 +12,6 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "lol/math/real.h"
 #include "lol/math/remez.h"
 

test/sandbox/sample.cpp

@@ -12,10 +12,6 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "core.h"
 
 class Moo

test/testsuite.cpp

@@ -15,10 +15,6 @@
 #include <cstdio>
 #include <cstdlib>
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include <lol/unit.h>
 
 int main(int argc, char **argv)

test/xolotl/xolotl.cpp

@@ -19,10 +19,6 @@
 
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #include "xolotl.h"
 
 class Xolotl : public WorldEntity

tutorial/01_triangle.cpp

@@ -18,10 +18,6 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #if defined _WIN32
 #   include <direct.h>
 #endif

tutorial/02_cube.cpp

@@ -18,10 +18,6 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #if defined _WIN32
 #   include <direct.h>
 #endif

tutorial/05_easymesh.cpp

@@ -17,10 +17,6 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 class EasyMeshTutorial : public WorldEntity
 {
 public:

tutorial/08_fbo.cpp

@@ -18,10 +18,6 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #if defined _WIN32
 #   include <direct.h>
 #endif

tutorial/11_fractal.cpp

@@ -20,18 +20,13 @@
 
 using namespace lol;
 
-#if defined _WIN32 && defined USE_D3D9
-#   define FAR
-#   define NEAR
-#   include <d3d9.h>
-#endif
-
-#if USE_SDL
-#   include <SDL_main.h>
-#endif
-
 #if defined _WIN32
 #   include <direct.h>
+#   if defined USE_D3D9
+#       define FAR
+#       define NEAR
+#       include <d3d9.h>
+#   endif
 #endif
 
 extern char const *lolfx_11_fractal;