MERGE: Merge trunk to branch.

svn-id: r52564

1 files changed, 77 insertions, 22 deletions

diff --git a/configure b/configure
index f3eb9a268d..3f17cb848b 100755
--- a/configure
+++ b/configure
@@ -88,6 +88,7 @@ add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
 add_engine groovie "Groovie" yes "groovie2"
 add_engine groovie2 "Groovie 2 games" no
+add_engine hugo "Hugo Trilogy" no
 add_engine kyra "Legend of Kyrandia" yes "lol"
 add_engine lol "Lands of Lore" no
 add_engine lure "Lure of the Temptress" yes
@@ -135,6 +136,7 @@ _build_hq_scalers=yes
 _indeo3=auto
 _enable_prof=no
 _unix=no
+_global_constructors=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -362,6 +364,9 @@ get_system_exe_extension() {
 	arm-riscos)
 		_exeext=",ff8"
 		;;
+	caanoo-linux)
+		_exeext=".caanoo"
+		;;		
 	dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
 		_exeext=".elf"
 		;;
@@ -645,7 +650,7 @@ Usage: $0 [OPTIONS]...
 
 Configuration:
   -h, --help              display this help and exit
-  --backend=BACKEND       backend to build (dc, gp2x, gp2xwiz, iphone,
+  --backend=BACKEND       backend to build (caanoo, dc, gp2x, gp2xwiz, iphone,
                           linuxmoto, ds, null, ps2, psp, sdl, wii, wince)
                           [sdl]
 
@@ -930,6 +935,16 @@ arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
 	;;
+caanoo)
+	_host_os=caanoo-linux
+	_host_cpu=arm
+	_host_alias=arm-none-linux-gnueabi
+	;;
+dingux)
+	_host_os=linux
+	_host_cpu=mipsel
+	_host_alias=mipsel-linux
+	;;
 dreamcast)
 	_host_os=dreamcast
 	_host_cpu=sh
@@ -1263,6 +1278,17 @@ if test "$cxx_verc_fail" = yes ; then
 	exit 1
 fi
 
+echocheck "whether -Wglobal-constructors work"
+cat > $TMPC << EOF
+int main() { return 0; }
+EOF
+cc_check -Wglobal-constructors && _global_constructors=yes
+
+if test "$_global_constructors" = yes; then
+	CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
+fi
+echo $_global_constructors
+
 #
 # Check for endianness
 #
@@ -1455,7 +1481,7 @@ case $_host_os in
 		_unix=yes
 		;;
 	n64)
-		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT" 
+		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
 		DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_COMMAND_LINE"
 		DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 		;;
@@ -1533,10 +1559,43 @@ if test -n "$_host"; then
 		bfin*)
 			_need_memalign=yes
 			;;
+		caanoo)
+			DEFINES="$DEFINES -DGP2XWIZ -DCAANOO -DNDEBUG"
+			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
+			ASFLAGS="$ASFLAGS"
+			_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_COSTUME_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+			_backend="gp2xwiz"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
+			_port_mk="backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk"
+			;;			
 		*darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
+		dingux)
+			DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL"
+			ASFLAGS="$ASFLAGS"
+			CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
+			_need_memalign=yes
+			_backend="dingux"
+			_mt32emu=no
+			_vkeybd=yes
+			_build_hq_scalers=no
+			_keymapper=no
+			# Force disable vorbis on dingux, it has terrible performance compared to tremor
+			_vorbis=no
+			# Force disable seq on dingux, no way to use it and it would get enabled by default with configure
+			_seq_midi=no
+			;;
 		dreamcast)
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
@@ -1692,7 +1751,6 @@ if test -n "$_host"; then
 			_backend="n64"
 			_need_memalign=yes
 			_mt32emu=no
-			_vkeybd=yes
 			_build_scalers=no
 			_indeo3=no
 			_translation=no
@@ -1856,7 +1914,7 @@ fi
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
-	dreamcast | samsungtv | sdl | wii | psp)
+	dreamcast | dingux | samsungtv | sdl | wii | psp)
 		if test "$_16bit" = auto ; then
 			_16bit=yes
 		else
@@ -1996,24 +2054,6 @@ PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 '
 		;;
-	gp2xwiz*)
-_def_plugin='
-#define PLUGIN_PREFIX	""
-#define PLUGIN_SUFFIX	".plugin"
-'
-_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plugin
-PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS        += -DDYNAMIC_MODULES
-CXXFLAGS        += -fpic
-PLUGIN_LDFLAGS  += -shared
-PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
-POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS            += -ldl
-'
-		;;
 	linux*|android)
 _def_plugin='
 #define PLUGIN_PREFIX	"lib"
@@ -2579,11 +2619,26 @@ case $_backend in
 		add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
 		add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so'
 		;;
+	caanoo)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		LDFLAGS="$LDFLAGS"
+		CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
+		;;		
 	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"
 		;;
+	dingux)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
+		LDFLAGS="$LDFLAGS "
+		MODULES="$MODULES backends/platform/sdl"
+		;;
 	ds)
 		# TODO ds
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'