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

[vinterstum at users.sourceforge.net]

Revision: 24421
          http://svn.sourceforge.net/scummvm/?rev=24421&view=rev
Author:   vinterstum
Date:     2006-10-21 13:41:49 -0700 (Sat, 21 Oct 2006)

Log Message:
-----------
Adding CXXFLAGS usage for various configure script tests, needed to properly crosscompile for OS X 10.2 on Intel Macs

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/tools/module.mk

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2006-10-21 20:26:33 UTC (rev 24420)
+++ scummvm/trunk/configure	2006-10-21 20:41:49 UTC (rev 24421)
@@ -110,7 +110,7 @@
 	echo >> "$TMPLOG"
 	echo "$CXX $TMPC -o $TMPO$EXEEXT $@" >> "$TMPLOG"
 	rm -f "$TMPO$EXEEXT"
-	( $CXX "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+	( $CXX $CXXFLAGS "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
 	TMP="$?"
 	echo >> "$TMPLOG"
 	return "$TMP"
@@ -158,7 +158,7 @@
 	# In cross-compiling mode, we cannot run the result
 	eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 else
-	eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
+	eval "$1 $CXXFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 fi
 }
 
@@ -229,7 +229,7 @@
 	return 0;
 }
 EOF
-if eval "$CXX -o tmp_find_type_with_size$EXEEXT tmp_find_type_with_size.cpp"; then
+if eval "$CXX $CXXFLAGS -o tmp_find_type_with_size$EXEEXT tmp_find_type_with_size.cpp"; then
 	datatype=`./tmp_find_type_with_size $1`
 	if test "$datatype" = "unknown"; then
 		echo "couldn't find data type with $1 bytes"
@@ -805,7 +805,7 @@
 	return 0;
 }
 EOF
-	$CXX -o tmp_endianness_check$EXEEXT tmp_endianness_check.cpp
+	$CXX $CXXFLAGS -o tmp_endianness_check$EXEEXT tmp_endianness_check.cpp
 	endianness=`./tmp_endianness_check`
 	echo $endianness;
 	case $endianness in

Modified: scummvm/trunk/tools/module.mk
===================================================================
--- scummvm/trunk/tools/module.mk	2006-10-21 20:26:33 UTC (rev 24420)
+++ scummvm/trunk/tools/module.mk	2006-10-21 20:41:49 UTC (rev 24421)
@@ -27,11 +27,11 @@
 
 tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
 	$(MKDIR) tools/$(DEPDIR)
-	$(CC) -Wall -o $@ $<
+	$(CC) $(CFLAGS) -Wall -o $@ $<
 
 tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
 	$(MKDIR) tools/$(DEPDIR)
-	$(CC) -Wall -o $@ $<
+	$(CC) $(CFLAGS) -Wall -o $@ $<
 
 #
 # Rules to explicitly rebuild the credits / MD5 tables.


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