[Scummvm-cvs-logs] SF.net SVN: scummvm:[51635] scummvm/trunk/configure
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Aug 2 19:11:25 CEST 2010
Revision: 51635
http://scummvm.svn.sourceforge.net/scummvm/?rev=51635&view=rev
Author: fingolfin
Date: 2010-08-02 17:11:25 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
BUILD: Order host names (in particular ds and android) alphabetically
Modified Paths:
--------------
scummvm/trunk/configure
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2010-08-02 17:11:12 UTC (rev 51634)
+++ scummvm/trunk/configure 2010-08-02 17:11:25 UTC (rev 51635)
@@ -362,7 +362,7 @@
arm-riscos)
_exeext=",ff8"
;;
- dreamcast | gamecube | ds | ps2 | psp | wii | n64)
+ dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
_exeext=".elf"
;;
gp2x-linux)
@@ -921,6 +921,11 @@
NATIVEEXEEXT=$_exeext
case $_host in
+android)
+ _host_os=android
+ _host_cpu=arm
+ _host_alias=arm-oe-linux-androideabi
+ ;;
arm-riscos)
_host_os=riscos
_host_cpu=arm
@@ -932,6 +937,11 @@
CXXFLAGS="$CXXFLAGS -ml -m4-single-only"
LDFLAGS="$LDFLAGS -ml -m4-single-only"
;;
+ds)
+ _host_os=ds
+ _host_cpu=arm
+ _host_alias=arm-eabi
+ ;;
gamecube)
_host_os=gamecube
_host_cpu=ppc
@@ -970,11 +980,6 @@
_host_cpu=arm
_host_alias=arm-linux-gnueabi
;;
-ds)
- _host_os=ds
- _host_cpu=arm
- _host_alias=arm-eabi
- ;;
n64)
_host_os=n64
_host_cpu=mips
@@ -1030,11 +1035,6 @@
_host_cpu=arm
_host_alias=arm-wince-mingw32ce
;;
-android)
- _host_os=android
- _host_cpu=arm
- _host_alias=arm-oe-linux-androideabi
- ;;
*)
if test -n "$_host"; then
guessed_host=`$_srcdir/config.sub $_host`
@@ -1096,7 +1096,13 @@
# Platform specific sanity checks
#
case $_host_os in
-gamecube | ds | wii)
+android)
+ if test -z "$ANDROID_SDK"; then
+ echo "Please set ANDROID_SDK in your environment. export ANDROID_SDK=<path to Android SDK>"
+ exit 1
+ fi
+ ;;
+ds | gamecube | wii)
if test -z "$DEVKITPRO"; then
echo "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to devkitPRO>"
exit 1
@@ -1115,12 +1121,6 @@
exit 1
fi
;;
-android)
- if test -z "$ANDROID_SDK"; then
- echo "Please set ANDROID_SDK in your environment. export ANDROID_SDK=<path to Android SDK>"
- exit 1
- fi
- ;;
*)
;;
esac
@@ -1354,6 +1354,12 @@
# as (unsigned) long, and consequently we'd get a compiler error otherwise.
type_4_byte='long'
;;
+ android)
+ CXXFLAGS="$CXXFLAGS -Os -msoft-float -mtune=xscale -march=armv5te -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__"
+ add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
+ _unix=yes
+ _seq_midi=no
+ ;;
beos*)
DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
# Needs -lbind -lsocket for the timidity MIDI driver
@@ -1380,6 +1386,15 @@
dreamcast)
DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
;;
+ ds)
+ # TODO Nintendo DS
+ DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+ CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
+ CXXFLAGS="$CXXFLAGS -mthumb-interwork -ffunction-sections -fdata-sections -fno-strict-aliasing"
+ LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections"
+ LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
+ LIBS="$LIBS -lnds9"
+ ;;
freebsd*)
LDFLAGS="$LDFLAGS -L/usr/local/lib"
CXXFLAGS="$CXXFLAGS -I/usr/local/include"
@@ -1428,15 +1443,6 @@
DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_COMMAND_LINE"
DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL"
;;
- ds)
- # TODO Nintendo DS
- DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
- CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
- CXXFLAGS="$CXXFLAGS -mthumb-interwork -ffunction-sections -fdata-sections -fno-strict-aliasing"
- LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections"
- LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
- LIBS="$LIBS -lnds9"
- ;;
os2-emx*)
_unix=yes # FIXME??? Why??
;;
@@ -1466,12 +1472,6 @@
DEFINES="$DEFINES -D_WIN32_WCE=300 -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
;;
- android)
- CXXFLAGS="$CXXFLAGS -Os -msoft-float -mtune=xscale -march=armv5te -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__"
- add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
- _unix=yes
- _seq_midi=no
- ;;
# given this is a shell script assume some type of unix
*)
echo "WARNING: could not establish system type, assuming unix like"
@@ -1483,6 +1483,19 @@
# Cross-compiling mode - add your target here if needed
echo "Cross-compiling to $_host"
case "$_host" in
+ android)
+ DEFINES="$DEFINES -DANDROID -DUSE_ARM_SMUSH_ASM"
+ _unix=yes
+ _need_memalign=yes
+ add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+ _backend="android"
+ _port_mk="backends/platform/android/android.mk"
+ _seq_midi=no
+ ;;
arm-linux|arm*-linux-gnueabi|arm-*-linux)
_unix=yes
_need_memalign=yes
@@ -1515,6 +1528,24 @@
add_line_to_config_mk 'ronindir = /usr/local/ronin'
_port_mk="backends/platform/dc/dreamcast.mk"
;;
+ ds)
+ # TODO: complete this
+ DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
+ DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID"
+ DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
+ _need_memalign=yes
+ add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+ _backend="ds"
+ _build_scalers="no"
+ _mt32emu="no"
+ _port_mk="backends/platform/ds/ds.mk"
+ ;;
gamecube)
_endian=big
_need_memalign=yes
@@ -1628,24 +1659,6 @@
_seq_midi=no
_port_mk="backends/platform/linuxmoto/linuxmoto.mk"
;;
- ds)
- # TODO: complete this
- DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
- DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
- DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
- DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID"
- DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
- _need_memalign=yes
- add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
- add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
- add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
- add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
- add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
- _backend="ds"
- _build_scalers="no"
- _mt32emu="no"
- _port_mk="backends/platform/ds/ds.mk"
- ;;
n64)
CXXFLAGS="$CXXFLAGS -mno-extern-sdata -O2 --param max-inline-insns-auto=20 -fomit-frame-pointer"
CXXFLAGS="$CXXFLAGS -march=vr4300 -mtune=vr4300 -mhard-float -fno-rtti -fno-exceptions -Wno-multichar -Wshadow"
@@ -1763,19 +1776,6 @@
_mt32emu="no"
_port_mk="backends/platform/wince/wince.mk"
;;
- android)
- DEFINES="$DEFINES -DANDROID -DUSE_ARM_SMUSH_ASM"
- _unix=yes
- _need_memalign=yes
- add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
- add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
- add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
- add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
- add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
- _backend="android"
- _port_mk="backends/platform/android/android.mk"
- _seq_midi=no
- ;;
*)
echo "WARNING: Unknown target, continuing with auto-detected values"
;;
@@ -2471,11 +2471,49 @@
# Backend related stuff
#
case $_backend in
+ android)
+ static_libs=''
+ system_libs=''
+ for lib in $LIBS; do
+ case $lib in
+ -lz|-lm)
+ system_libs="$system_libs $lib"
+ ;;
+ *)
+ static_libs="$static_libs $lib"
+ ;;
+ esac
+ done
+
+ # -lgcc is carefully placed here - we want to catch
+ # all toolchain symbols in *our* libraries rather
+ # than pick up anything unhygenic from the Android libs.
+ LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -lstdc++ -llog -lGLESv1_CM"
+ DEFINES="$DEFINES -D__ANDROID__ -DANDROID_BACKEND -DREDUCE_MEMORY_USAGE"
+ add_line_to_config_mk 'PLUGIN_LDFLAGS += $(LDFLAGS) -Wl,-shared,-Bsymbolic'
+
+ # Work around an Android 2.0+ run-time linker bug:
+ # The linker doesn't actually look in previously
+ # loaded libraries when trying to resolve symbols -
+ # effectively turning all dlopen(RTLD_GLOBAL) calls
+ # into dlopen(RTLD_LOCAL). It *does* look in
+ # DT_NEEDED libraries, so the workaround is to add an
+ # (otherwise unnecessary) dependency from plugins back
+ # to the main libscummvm.so.
+ add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
+ add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so'
+ ;;
dc)
INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
LIBS="$LIBS -lronin -lm"
;;
+ ds)
+ # TODO ds
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
+ INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
+ INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
+ ;;
gp2x)
find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
@@ -2500,12 +2538,6 @@
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
;;
- ds)
- # TODO ds
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
- INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
- INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
- ;;
n64)
INCLUDES="$INCLUDES "'-I/opt/mips64-toolchain/include'
INCLUDES="$INCLUDES "'-I/opt/mips64-toolchain/mips64/include'
@@ -2558,38 +2590,6 @@
INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
LIBS="$LIBS -static -lSDL"
;;
- android)
- static_libs=''
- system_libs=''
- for lib in $LIBS; do
- case $lib in
- -lz|-lm)
- system_libs="$system_libs $lib"
- ;;
- *)
- static_libs="$static_libs $lib"
- ;;
- esac
- done
-
- # -lgcc is carefully placed here - we want to catch
- # all toolchain symbols in *our* libraries rather
- # than pick up anything unhygenic from the Android libs.
- LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -lstdc++ -llog -lGLESv1_CM"
- DEFINES="$DEFINES -D__ANDROID__ -DANDROID_BACKEND -DREDUCE_MEMORY_USAGE"
- add_line_to_config_mk 'PLUGIN_LDFLAGS += $(LDFLAGS) -Wl,-shared,-Bsymbolic'
-
- # Work around an Android 2.0+ run-time linker bug:
- # The linker doesn't actually look in previously
- # loaded libraries when trying to resolve symbols -
- # effectively turning all dlopen(RTLD_GLOBAL) calls
- # into dlopen(RTLD_LOCAL). It *does* look in
- # DT_NEEDED libraries, so the workaround is to add an
- # (otherwise unnecessary) dependency from plugins back
- # to the main libscummvm.so.
- add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
- add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so'
- ;;
*)
echo "support for $_backend backend not implemented in configure script yet"
exit 1
@@ -2605,7 +2605,7 @@
case $_host_os in
# newlib-based system include files suppress non-C89 function
# declarations under __STRICT_ANSI__
- mingw* | dreamcast | wii | gamecube | ds | psp | wince | amigaos* | android | n64)
+ amigaos* | android | ds | dreamcast | gamecube | mingw* | n64 | psp | wii | wince )
CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
;;
*)
@@ -2626,7 +2626,7 @@
# Some platforms use certain GNU extensions in header files
case $_host_os in
-gamecube | psp | wii | android)
+android | gamecube | psp | wii)
;;
*)
CXXFLAGS="$CXXFLAGS -pedantic"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list