diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 37 |
1 files changed, 29 insertions, 8 deletions
@@ -35,6 +35,7 @@ SAVED_CXXFLAGS=$CXXFLAGS SAVED_CPPFLAGS=$CPPFLAGS SAVED_ASFLAGS=$ASFLAGS SAVED_WINDRESFLAGS=$WINDRESFLAGS +SAVED_SDL_CONFIG=$SDL_CONFIG # Use environment vars if set CXXFLAGS="$CXXFLAGS $CPPFLAGS" @@ -353,7 +354,7 @@ define_in_config_if_yes() { # TODO: small bit of code to test sdl usability find_sdlconfig() { echo_n "Looking for sdl-config... " - sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config" + sdlconfigs="$SDL_CONFIG:$_sdlconfig:sdl-config:sdl11-config:sdl12-config" _sdlconfig= IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR" @@ -1318,7 +1319,7 @@ ds) ;; gamecube) _host_os=gamecube - _host_cpu=ppc + _host_cpu=powerpc _host_alias=powerpc-eabi ;; gp2x) @@ -1386,7 +1387,7 @@ openpandora) ;; ppc-amigaos) _host_os=amigaos - _host_cpu=ppc + _host_cpu=powerpc ;; ps2) _host_os=ps2 @@ -1398,7 +1399,7 @@ ps2) ;; ps3) _host_os=ps3 - _host_cpu=ppc + _host_cpu=powerpc _host_alias=powerpc64-ps3-elf # The prefix is always the same on PS3 so we hardcode the default @@ -1444,7 +1445,7 @@ webos) ;; wii) _host_os=wii - _host_cpu=ppc + _host_cpu=powerpc _host_alias=powerpc-eabi ;; wince) @@ -2004,7 +2005,7 @@ cc_check_clean tmp_find_type_with_size.cpp # for the smaller sizes. echo_n "Alignment required... " case $_host_cpu in - i[3-6]86 | amd64 | x86_64 | ppc*) + i[3-6]86 | amd64 | x86_64 | powerpc*) # Unaligned access should work _need_memalign=no ;; @@ -2047,7 +2048,7 @@ case $_host_cpu in echo "MIPS" DEFINES="$DEFINES -DMIPS_TARGET" ;; - ppc*) + powerpc*) echo "PowerPC" DEFINES="$DEFINES -DPPC_TARGET" ;; @@ -2181,8 +2182,21 @@ case $_host_os in exit 1 ;; darwin*) + # Pass -mlongcall to gcc so that it emits long calls + # which will allow for calls larger than 32MB. The linker + # will discard the calls if they are not needed, but we + # need to ensure the compiler emits them in the first place. + case $_host_cpu in + powerpc*) + CFLAGS="$CFLAGS -mlongcall" + CXXFLAGS="$CXXFLAGS -mlongcall" + ;; + esac + DEFINES="$DEFINES -DMACOSX" LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" + # SDL2 doesn't seem to add Cocoa for us. + LIBS="$LIBS -framework Cocoa" add_line_to_config_mk 'MACOSX = 1' # Now we may have MacPorts or Fink installed @@ -3058,6 +3072,9 @@ case $_backend in 1.3.*) add_line_to_config_mk "USE_SDL13 = 1" ;; + 2.0.*) + add_line_to_config_mk "USE_SDL2 = 1" + ;; *) ;; esac @@ -3539,7 +3556,7 @@ if test "$_alsa" = yes ; then LIBS="$LIBS $ALSA_LIBS -lasound" INCLUDES="$INCLUDES $ALSA_CFLAGS" fi -define_in_config_h_if_yes "$_alsa" 'USE_ALSA' +define_in_config_if_yes "$_alsa" 'USE_ALSA' echo "$_alsa" # @@ -4504,6 +4521,7 @@ $_def_64bit_type_unsigned #else $_def_64bit_type_unsigned #endif +#define HAVE_INT64 EOF fi @@ -4532,6 +4550,8 @@ WIN32PATH=$_win32path AMIGAOSPATH=$_amigaospath STATICLIBPATH=$_staticlibpath +ABI := $ABI + BACKEND := $_backend MODULES += $MODULES MODULE_DIRS += $MODULE_DIRS @@ -4567,6 +4587,7 @@ SAVED_CXXFLAGS := $SAVED_CXXFLAGS SAVED_CPPFLAGS := $SAVED_CPPFLAGS SAVED_ASFLAGS := $SAVED_ASFLAGS SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS +SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG EOF # |