Changeset 1691


Ignore:
Timestamp:
Aug 3, 2012, 1:33:16 PM (7 years ago)
Author:
sam
Message:

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

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r1684 r1691  
    167167            ;;
    168168        raspi-arm)
    169             ./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"
     169            ./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"
    170170            ;;
    171171        nacl-i386)
  • trunk/configure.ac

    r1684 r1691  
    295295LIBS="${LIBS} ${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
    296296AC_CHECK_HEADERS(SDL.h SDL/SDL.h, [ac_cv_my_have_sdl="yes"])
    297 AC_CHECK_HEADERS(SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
    298 AC_CHECK_HEADERS(SDL_image.h, [ac_cv_my_have_sdl_image="yes"])
     297AC_CHECK_HEADERS(SDL_mixer.h SDL/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
     298AC_CHECK_HEADERS(SDL_image.h SDL/SDL_image.h, [ac_cv_my_have_sdl_image="yes"])
    299299AC_CHECK_LIB(SDL, main,
    300300 [SDL_LIBS="${SDL_LIBS} -lSDL"],
  • trunk/src/audio.cpp

    r1513 r1691  
    1414
    1515#if defined USE_SDL_MIXER
    16 #   include <SDL.h>
    17 #   include <SDL_mixer.h>
     16#   if defined HAVE_SDL_SDL_H
     17#      include <SDL/SDL.h>
     18#   else
     19#      include <SDL.h>
     20#   endif
     21#   if defined HAVE_SDL_SDL_MIXER_H
     22#      include <SDL/SDL_mixer.h>
     23#   else
     24#      include <SDL_mixer.h>
     25#   endif
    1826#endif
    1927
  • trunk/src/image/codec/sdl-image.cpp

    r1513 r1691  
    1515#if defined USE_SDL_IMAGE
    1616
    17 #include <SDL.h>
    18 #include <SDL_image.h>
     17#if defined HAVE_SDL_SDL_H
     18#   include <SDL/SDL.h>
     19#else
     20#   include <SDL.h>
     21#endif
     22#if defined HAVE_SDL_SDL_IMAGE_H
     23#   include <SDL/SDL_image.h>
     24#else
     25#   include <SDL_image.h>
     26#endif
    1927
    2028#include "core.h"
  • trunk/src/input/input.cpp

    r1513 r1691  
    1515#include <cstdlib>
    1616
    17 #if defined USE_SDL
     17#if defined HAVE_SDL_SDL_H
     18#   include <SDL/SDL.h>
     19#else
    1820#   include <SDL.h>
    1921#endif
  • trunk/src/platform/sdl/sdlapp.cpp

    r1361 r1691  
    1414
    1515#if defined USE_SDL
    16 #   include <SDL.h>
     16#   if defined HAVE_SDL_SDL_H
     17#      include <SDL/SDL.h>
     18#   else
     19#      include <SDL.h>
     20#   endif
    1721#   if defined USE_D3D9
    1822#       include <d3d9.h>
  • trunk/src/platform/sdl/sdlinput.cpp

    r1399 r1691  
    1313#endif
    1414
    15 #if defined USE_SDL
     15#if defined HAVE_SDL_SDL_H
     16#   include <SDL/SDL.h>
     17#else
    1618#   include <SDL.h>
    1719#endif
  • trunk/src/sample.cpp

    r1513 r1691  
    1818
    1919#if defined USE_SDL_MIXER
    20 #   include <SDL.h>
    21 #   include <SDL_mixer.h>
     20#   if defined HAVE_SDL_SDL_H
     21#      include <SDL/SDL.h>
     22#   else
     23#      include <SDL.h>
     24#   endif
     25#   if defined HAVE_SDL_SDL_MIXER_H
     26#      include <SDL/SDL_mixer.h>
     27#   else
     28#      include <SDL_mixer.h>
     29#   endif
    2230#endif
    2331
  • trunk/src/timer.cpp

    r1309 r1691  
    3131#   include <sys/timer.h>
    3232#   include <sys/time_util.h>
     33#elif defined HAVE_SDL_SDL_H
     34#   include <SDL/SDL.h>
    3335#else
    3436#   include <SDL.h>
Note: See TracChangeset for help on using the changeset viewer.