diff options
author | Andre Heider | 2010-08-28 12:51:12 +0000 |
---|---|---|
committer | Andre Heider | 2010-08-28 12:51:12 +0000 |
commit | 80b9e8371b3cb8ef07df3495f8569271f8088211 (patch) | |
tree | 194d26afb0dd18aae730892e9e7c7567069a45e2 /configure | |
parent | c45b3e4e0e66ae56d06dcf1215477cf77eecc375 (diff) | |
download | scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.gz scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.tar.bz2 scummvm-rg350-80b9e8371b3cb8ef07df3495f8569271f8088211.zip |
WII: svn merge Wii port commits from trunk
svn-id: r52425
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1415,9 +1415,9 @@ case $_host_os in gamecube) CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float" CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched" - CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include -I$DEVKITPRO/cube/include" + CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include" # libogc is required to link the cc tests (includes _start()) - LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -L$DEVKITPRO/cube/lib -logc" + LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -logc" ;; haiku*) DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE" @@ -1475,9 +1475,9 @@ case $_host_os in wii) CXXFLAGS="$CXXFLAGS -Os -mrvl -mcpu=750 -meabi -mhard-float" CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched" - CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include -I$DEVKITPRO/wii/include" + CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include" # libogc is required to link the cc tests (includes _start()) - LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -L$DEVKITPRO/wii/lib -logc" + LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -logc" ;; wince) CXXFLAGS="$CXXFLAGS -O3 -march=armv4 -mtune=xscale" @@ -1567,10 +1567,12 @@ if test -n "$_host"; then _mt32emu=no _port_mk="backends/platform/wii/wii.mk" add_line_to_config_mk 'GAMECUBE = 1' + add_line_to_config_h '#define AUDIO_REVERSE_STEREO' add_line_to_config_h '#define GAMECUBE' add_line_to_config_h "/* #define DEBUG_WII_USBGECKO */" add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */" add_line_to_config_h "/* #define DEBUG_WII_GDB */" + add_line_to_config_h "#define USE_WII_DI" ;; gp2x) DEFINES="$DEFINES -DGP2X -DNDEBUG" @@ -1766,6 +1768,7 @@ if test -n "$_host"; then _build_scalers=no _port_mk="backends/platform/wii/wii.mk" add_line_to_config_mk 'GAMECUBE = 0' + add_line_to_config_h '#define AUDIO_REVERSE_STEREO' add_line_to_config_h "#define DEBUG_WII_USBGECKO" add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */" add_line_to_config_h "/* #define DEBUG_WII_GDB */" @@ -2628,10 +2631,10 @@ case $_backend in DEFINES="$DEFINES -D__WII__ -DGEKKO" case $_host_os in gamecube) - LIBS="$LIBS -lgxflux -lfat -logc -ldb" + LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb" ;; *) - LIBS="$LIBS -lgxflux -ldi -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb" + LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb" ;; esac ;; |