Changeset 1691Tweet

Timestamp:

Aug 3, 2012, 1:33:16 PM (11 years ago)

Author:

sam

Message:

build: tweak everything to allow building with SDL on the Raspberry Pi.

Location:

trunk

Files:

• build/lol-build (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/audio.cpp (modified) (1 diff)
• src/image/codec/sdl-image.cpp (modified) (1 diff)
• src/input/input.cpp (modified) (1 diff)
• src/platform/sdl/sdlapp.cpp (modified) (1 diff)
• src/platform/sdl/sdlinput.cpp (modified) (1 diff)
• src/sample.cpp (modified) (1 diff)
• src/timer.cpp (modified) (1 diff)

trunk/build/lol-build

@@ -167 +167 @@
             ;;
         raspi-arm)
-            ./configure --host=arm-bcm2708hardfp-linux-gnueabi CPPFLAGS="-I$RASPI_SDK_ROOT/firmware/opt/vc/include -I$RASPI_SDK_ROOT/firmware/opt/vc/include/interface/vcos/pthreads" LDFLAGS="-L$RASPI_SDK_ROOT/firmware/opt/vc/lib"
+            ./configure --host=arm-bcm2708hardfp-linux-gnueabi CPPFLAGS="-I$RASPI_SDK_ROOT/firmware/opt/vc/include -I$RASPI_SDK_ROOT/firmware/opt/vc/include/interface/vcos/pthreads -I$RASPI_SDK_ROOT/chroot/usr/include" LDFLAGS="-L$RASPI_SDK_ROOT/firmware/opt/vc/lib -L$RASPI_SDK_ROOT/chroot/lib/arm-linux-gnueabihf -Wl,-rpath-link -Wl,$RASPI_SDK_ROOT/chroot/lib/arm-linux-gnueabihf -L$RASPI_SDK_ROOT/chroot/usr/lib/arm-linux-gnueabihf -Wl,-rpath-link -Wl,$RASPI_SDK_ROOT/chroot/usr/lib/arm-linux-gnueabihf -Wl,--unresolved-symbols=ignore-in-shared-libs"
             ;;
         nacl-i386)

trunk/configure.ac

@@ -295 +295 @@
 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, [ac_cv_my_have_sdl_mixer="yes"])
-AC_CHECK_HEADERS(SDL_image.h, [ac_cv_my_have_sdl_image="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"],

trunk/src/audio.cpp

@@ -14 +14 @@
 
 #if defined USE_SDL_MIXER
-#   include <SDL.h>
-#   include <SDL_mixer.h>
+#   if defined HAVE_SDL_SDL_H
+#      include <SDL/SDL.h>
+#   else
+#      include <SDL.h>
+#   endif
+#   if defined HAVE_SDL_SDL_MIXER_H
+#      include <SDL/SDL_mixer.h>
+#   else
+#      include <SDL_mixer.h>
+#   endif
 #endif
 

trunk/src/image/codec/sdl-image.cpp

@@ -15 +15 @@
 #if defined USE_SDL_IMAGE
 
-#include <SDL.h>
-#include <SDL_image.h>
+#if defined HAVE_SDL_SDL_H
+#   include <SDL/SDL.h>
+#else
+#   include <SDL.h>
+#endif
+#if defined HAVE_SDL_SDL_IMAGE_H
+#   include <SDL/SDL_image.h>
+#else
+#   include <SDL_image.h>
+#endif
 
 #include "core.h"

trunk/src/input/input.cpp

@@ -15 +15 @@
 #include <cstdlib>
 
-#if defined USE_SDL
+#if defined HAVE_SDL_SDL_H
+#   include <SDL/SDL.h>
+#else
 #   include <SDL.h>
 #endif

trunk/src/platform/sdl/sdlapp.cpp

@@ -14 +14 @@
 
 #if defined USE_SDL
-#   include <SDL.h>
+#   if defined HAVE_SDL_SDL_H
+#      include <SDL/SDL.h>
+#   else
+#      include <SDL.h>
+#   endif
 #   if defined USE_D3D9
 #       include <d3d9.h>

trunk/src/platform/sdl/sdlinput.cpp

@@ -13 +13 @@
 #endif
 
-#if defined USE_SDL
+#if defined HAVE_SDL_SDL_H
+#   include <SDL/SDL.h>
+#else
 #   include <SDL.h>
 #endif

trunk/src/sample.cpp

@@ -18 +18 @@
 
 #if defined USE_SDL_MIXER
-#   include <SDL.h>
-#   include <SDL_mixer.h>
+#   if defined HAVE_SDL_SDL_H
+#      include <SDL/SDL.h>
+#   else
+#      include <SDL.h>
+#   endif
+#   if defined HAVE_SDL_SDL_MIXER_H
+#      include <SDL/SDL_mixer.h>
+#   else
+#      include <SDL_mixer.h>
+#   endif
 #endif
 

trunk/src/timer.cpp

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