[Scummvm-cvs-logs] SF.net SVN: scummvm: [24422] scummvm/branches/branch-0-9-0
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Sat Oct 21 22:44:00 CEST 2006
Revision: 24422
http://svn.sourceforge.net/scummvm/?rev=24422&view=rev
Author: vinterstum
Date: 2006-10-21 13:43:55 -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/branches/branch-0-9-0/configure
scummvm/branches/branch-0-9-0/tools/module.mk
Modified: scummvm/branches/branch-0-9-0/configure
===================================================================
--- scummvm/branches/branch-0-9-0/configure 2006-10-21 20:41:49 UTC (rev 24421)
+++ scummvm/branches/branch-0-9-0/configure 2006-10-21 20:43:55 UTC (rev 24422)
@@ -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"
@@ -141,7 +141,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
}
@@ -212,7 +212,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"
@@ -863,7 +863,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/branches/branch-0-9-0/tools/module.mk
===================================================================
--- scummvm/branches/branch-0-9-0/tools/module.mk 2006-10-21 20:41:49 UTC (rev 24421)
+++ scummvm/branches/branch-0-9-0/tools/module.mk 2006-10-21 20:43:55 UTC (rev 24422)
@@ -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.
More information about the Scummvm-git-logs
mailing list