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

[fingolfin at users.sourceforge.net]

Revision: 44340
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44340&view=rev
Author:   fingolfin
Date:     2009-09-25 11:03:04 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Cleanup configure script: (1) don't add -DUSE_ARM_*_ASM redundantly to DEFINES, we already add these automatically in ports.mk; and (2) #define macros that determine the host OS consistently via -D and not via config.h

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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-09-25 10:11:31 UTC (rev 44339)
+++ scummvm/trunk/configure	2009-09-25 11:03:04 UTC (rev 44340)
@@ -1240,17 +1240,16 @@
 	case "$_host" in
 		linupy|arm-riscos)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX"
+			DEFINES="$DEFINES -DUNIX -DLINUPY"
 			_endian=little
 			_need_memalign=yes
-			add_line_to_config_h "#define LINUPY"
 			type_1_byte='char'
 			type_2_byte='short'
 			type_4_byte='int'
 			;;
 		arm-linux|arm*-linux-gnueabi|arm-*-linux|*-angstrom-linux)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX -DUSE_ARM_SMUSH_ASM"
+			DEFINES="$DEFINES -DUNIX"
 			#not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen
 			_endian=little
 			_need_memalign=yes
@@ -1262,7 +1261,7 @@
 			;;
 		motoezx)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX -DMOTOEZX -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
+			DEFINES="$DEFINES -DUNIX -DMOTOEZX"
 			#not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_endian=little
@@ -1279,7 +1278,7 @@
 			;;
 		motomagx)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX -DMOTOMAGX -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
+			DEFINES="$DEFINES -DUNIX -DMOTOMAGX"
 			#not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_endian=little
@@ -1303,7 +1302,7 @@
 			;;
 		gp2xwiz)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX -DGP2XWIZ -DNDEBUG -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
+			DEFINES="$DEFINES -DUNIX -DGP2XWIZ -DNDEBUG"
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			LDFLAGS="$LDFLAGS"
 			_endian=little
@@ -1322,7 +1321,7 @@
 			;;	
 		gp2x)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX -DGP2X -DNDEBUG -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
+			DEFINES="$DEFINES -DUNIX -DGP2X -DNDEBUG"
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
@@ -1342,10 +1341,9 @@
 			;;
 		neuros)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DUNIX"
+			DEFINES="$DEFINES -DUNIX -DNEUROS"
 			_endian=little
 			_need_memalign=yes
-			add_line_to_config_h "#define NEUROS"
 			type_1_byte='char'
 			type_2_byte='short'
 			type_4_byte='int'
@@ -1385,7 +1383,7 @@
 			;;
 		iphone)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-			DEFINES="$DEFINES -DIPHONE -DUNIX -DUSE_ARM_SMUSH_ASM"
+			DEFINES="$DEFINES -DIPHONE -DUNIX"
 			_endian=little
 			_need_memalign=yes
 			type_1_byte='char'
@@ -1471,7 +1469,7 @@
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
 			# TODO: complete this
 			# TODO: Maybe rename nds -> ds (would be more consistent with other backends)
-			DEFINES="$DEFINES -DUSE_ARM_SMUSH_ASM"
+			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			_endian=little
 			_need_memalign=yes
 			type_1_byte='char'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.