Changeset 2300 for trunkTweet

Timestamp:

Jan 31, 2013, 2:17:09 AM (7 years ago)

Author:

sam

Message:

build: add SDL detection code in new file lol-sdl.m4. The SDL2 version is
disabled until the engine code itself is ported to SDL2.

Location:

trunk

Files:

• build/autotools/m4/lol-sdl.m4 (added)
• configure.ac (modified) (1 diff)
• src/application/application.cpp (modified) (1 diff)
• src/eglapp.cpp (modified) (1 diff)
• src/input/input.cpp (modified) (3 diffs)
• src/platform/sdl/sdlapp.cpp (modified) (2 diffs)
• src/sys/timer.cpp (modified) (1 diff)

trunk/configure.ac

@@ -219 +219 @@
 LOL_CHECK_OPENGL
 
-
-dnl Use SDL? (always required on Linux or Win32)
-ac_cv_my_have_sdl="no"
-ac_cv_my_have_sdl_image="no"
-ac_cv_my_have_sdl_mixer="no"
-dnl
-dnl  First, try the proper pkg-config check
-PKG_CHECK_MODULES(SDL, sdl, [ac_cv_my_have_sdl="yes"], [:])
-PKG_CHECK_MODULES(SDLMIXER, SDL_mixer, [ac_cv_my_have_sdl_mixer="yes"], [:])
-PKG_CHECK_MODULES(SDLIMAGE, SDL_image, [ac_cv_my_have_sdl_image="yes"], [:])
-dnl
-dnl  Then the old sdl-config method
-if test "x${cross_compiling}" != xyes -a "${ac_cv_my_have_sdl}" != yes; then
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-  if test "${SDL_CONFIG}" != "no"; then
-    SDL_CFLAGS="${SDL_CFLAGS} `${SDL_CONFIG} --cflags`"
-    SDL_LIBS="${SDL_LIBS} `${SDL_CONFIG} --libs`"
-    ac_cv_my_have_sdl="yes"
-  fi
-fi
-dnl
-dnl  Maybe all this has failed, try direct inclusion
-save_CPPFLAGS="${CPPFLAGS}"
-save_LIBS="${LIBS}"
-CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
-LIBS="${LIBS} ${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
-AC_CHECK_HEADERS(SDL.h SDL/SDL.h, [ac_cv_my_have_sdl="yes"])
-AC_CHECK_HEADERS(SDL_mixer.h SDL/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
-AC_CHECK_HEADERS(SDL_image.h SDL/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"])
-AC_CHECK_LIB(SDL_image, main,
- [SDLIMAGE_LIBS="${SDLIMAGE_LIBS} -lSDL_image"],
- [ac_cv_my_have_sdl_image="no"])
-SDL_CFLAGS="${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
-SDL_LIBS="${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
-CPPFLAGS="${save_CPPFLAGS}"
-LIBS="${save_LIBS}"
-if test "${ac_cv_my_have_sdl}" = "no"; then
-  AC_MSG_WARN([SDL not found])
-else
-  AC_DEFINE(USE_SDL, 1, Define to 1 to use SDL)
-fi
-if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
-  AC_MSG_WARN([SDL_mixer not found])
-else
-  AC_DEFINE(USE_SDL_MIXER, 1, Define to 1 to use SDL_mixer)
-fi
-if test "${ac_cv_my_have_sdl_image}" = "no"; then
-  AC_MSG_WARN([SDL_image not found])
-else
-  AC_DEFINE(USE_SDL_IMAGE, 1, Define to 1 to use SDL_image)
-fi
-AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
-AM_CONDITIONAL(USE_SDL_MIXER, test "${ac_cv_my_have_sdl_mixer}" = "yes")
-AM_CONDITIONAL(USE_SDL_IMAGE, test "${ac_cv_my_have_sdl_image}" = "yes")
-
+LOL_CHECK_SDL
 
 dnl  Use Flex's FlexLexer.h or ours?

trunk/src/application/application.cpp

@@ -55 +55 @@
     /* FIXME: this macro is only deactivated if we include "lolgl.h" */
     EglApp app;
-#elif defined HAVE_SDL_H
+#elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
     SdlApp app;
 #else

trunk/src/eglapp.cpp

@@ -26 +26 @@
 
 #if defined USE_SDL
-#   if defined HAVE_SDL_SDL_H
+#   if defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
 #      include <SDL/SDL.h>
 #   else

trunk/src/input/input.cpp

@@ -116 +116 @@
 {
 #if defined USE_SDL
-#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION >= 3
+#   if SDL_VERSION_ATLEAST(1,3,0)
     Uint8 *keystate = SDL_GetKeyboardState(NULL);
-#else
+#   else
     Uint8 *keystate = SDL_GetKeyState(NULL);
-#endif
+#   endif
     //SOOOoooo ugly.
     for (int i = 0; i < Key::Last; ++i)
@@ -270 +270 @@
 #if defined USE_SDL
     /* Simulate a joystick using the keyboard. This SDL call is free. */
-#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION >= 3
+#   if SDL_VERSION_ATLEAST(1,3,0)
     Uint8 *keystate = SDL_GetKeyboardState(NULL);
-#else
+#   else
     Uint8 *keystate = SDL_GetKeyState(NULL);
-#endif
+#   endif
     int left = keystate[SDLK_d] - (keystate[SDLK_a] | keystate[SDLK_q]);
     int up = (keystate[SDLK_w] | keystate[SDLK_z]) - keystate[SDLK_s] ;
@@ -303 +303 @@
 {
 #if defined USE_SDL
-#   if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION >= 3
+#   if SDL_VERSION_ATLEAST(1,3,0)
     Uint8 *keystate = SDL_GetKeyboardState(NULL);
 #   else

trunk/src/platform/sdl/sdlapp.cpp

@@ -14 +14 @@
 
 #if defined USE_SDL
-#   if defined HAVE_SDL_SDL_H
+#   if defined HAVE_SDL2_SDL_H
+#      include <SDL2/SDL.h>
+#   elif defined HAVE_SDL_SDL_H
 #      include <SDL/SDL.h>
 #   else
@@ -74 +76 @@
     SDL_GetWMInfo(&wminfo);
     g_hwnd = wminfo.window;
+#   elif SDL_VERSION_ATLEAST(2,0,0)
+    TODO
 #   else
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);

trunk/src/sys/timer.cpp

@@ -31 +31 @@
 #   include <sys/timer.h>
 #   include <sys/time_util.h>
-#elif defined HAVE_SDL_SDL_H
+#elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
 #   include <SDL/SDL.h>
 #else