diff options
| author | vanfanel | 2015-03-20 19:11:30 +0100 |
|---|---|---|
| committer | vanfanel | 2015-07-20 17:13:19 +0200 |
| commit | d5862217c3a85e7bc5a148def238c3323991adf8 (patch) | |
| tree | 330d70223b659a7d501a01026a7dd65ed8a39296 | |
| parent | eeb9ec9af9c3b1e94d4cd5854e82ef5238f9f335 (diff) | |
| download | scummvm-rg350-d5862217c3a85e7bc5a148def238c3323991adf8.tar.gz scummvm-rg350-d5862217c3a85e7bc5a148def238c3323991adf8.tar.bz2 scummvm-rg350-d5862217c3a85e7bc5a148def238c3323991adf8.zip | |
RASPBERRYPI: Fixed cross-compilation.
| -rwxr-xr-x | configure | 24 |
1 files changed, 20 insertions, 4 deletions
@@ -856,6 +856,7 @@ Special configuration feature: tizen for Samsung Tizen caanoo for Caanoo dingux for Dingux + raspberrypi for Raspberry Pi dreamcast for Sega Dreamcast ds for Nintendo DS gamecube for Nintendo GameCube @@ -1294,6 +1295,11 @@ arm-riscos) _host_os=riscos _host_cpu=arm ;; +raspberrypi) + _host_os=linux + _host_cpu=arm + _host_alias=arm-linux-gnueabihf + ;; caanoo) _host_os=gph-linux _host_cpu=arm @@ -2982,8 +2988,8 @@ case $_backend in ;; raspberrypi) _use_dispmanx=no - DISPMANX_CXXFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux/ -I/opt/vc/include/interface/vcos/pthreads -mfpu=vfp -mfloat-abi=hard" - DISPMANX_LIBS="-L/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm" + DISPMANX_CXXFLAGS="-I$RPI_ROOTDIR/opt/vc/include -I$RPI_ROOTDIR/opt/vc/include/interface/vmcs_host/linux/ -I$RPI_ROOTDIR/opt/vc/include/interface/vcos/pthreads -mfpu=vfp -mfloat-abi=hard -I$RPI_ROOTDIR/opt/rpi_root/usr/include/SDL" + DISPMANX_LIBS="--sysroot=$RPI_ROOTDIR -L$RPI_ROOTDIR/usr/lib -L$RPI_ROOTDIR/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm" cat > $TMPC << EOF #include <bcm_host.h> @@ -3073,7 +3079,7 @@ MODULES="$MODULES backends/platform/$_backend" # Setup SDL specifics for SDL based backends # case $_backend in - dingux | gph | linuxmoto | maemo | openpandora | raspberrypi | samsungtv | sdl) + dingux | gph | linuxmoto | maemo | openpandora | samsungtv | sdl) find_sdlconfig INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" @@ -3142,7 +3148,17 @@ case $_backend in ;; esac - +# +# In raspberry Pi, we don't use find_sdlconfig since we could be crosscompiling, but still we use SDL +# +case $_backend in + raspberrypi) + INCLUDES="$INCLUDES -I$RPI_ROOTDIR/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT" + LIBS="$LIBS -L$RPI_ROOTDIR/usr/lib -L$RPI_ROOTDIR/usr/lib/arm-linux-gnueabihf -lSDL" + DEFINES="$DEFINES -DSDL_BACKEND" + add_line_to_config_mk "SDL_BACKEND = 1" +esac + # # Determine whether host is POSIX compliant, or at least POSIX # compatible enough to support our POSIX code (including dlsym(), |