[Scummvm-cvs-logs] SF.net SVN: scummvm:[52401] scummvm/trunk/configure

djwillis at users.sourceforge.net djwillis at users.sourceforge.net
Thu Aug 26 13:28:30 CEST 2010


Revision: 52401
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52401&view=rev
Author:   djwillis
Date:     2010-08-26 11:28:30 +0000 (Thu, 26 Aug 2010)

Log Message:
-----------
CONFIGURE: Add support for building for the GPH Caanoo.

The Caanoo is based on the GP2XWIZ backend but needs to be a seperate
target as it uses a different toolchain/libs etc. 

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-08-26 11:24:26 UTC (rev 52400)
+++ scummvm/trunk/configure	2010-08-26 11:28:30 UTC (rev 52401)
@@ -364,6 +364,9 @@
 	arm-riscos)
 		_exeext=",ff8"
 		;;
+	caanoo-linux)
+		_exeext=".caanoo"
+		;;		
 	dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
 		_exeext=".elf"
 		;;
@@ -647,7 +650,7 @@
 
 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]
 
@@ -932,6 +935,11 @@
 	_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
@@ -1538,6 +1546,24 @@
 		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
@@ -1979,7 +2005,7 @@
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
 '
 		;;
-	gp2x*)
+	gp2x* | gp2xwiz* | caanoo*)
 _def_plugin='
 #define PLUGIN_PREFIX	""
 #define PLUGIN_SUFFIX	".plugin"
@@ -1997,24 +2023,6 @@
 LIBS            += -ldl
 '
 		;;
-	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"
@@ -2560,6 +2568,13 @@
 		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'


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