[Scummvm-cvs-logs] CVS: scummvm configure,1.29,1.30
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 6 03:50:15 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv19782
Modified Files:
configure
Log Message:
#define MACOSX on the command line, not in config.h; add TODO regarding TMP file names
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- configure 6 Jul 2003 08:14:22 -0000 1.29
+++ configure 6 Jul 2003 10:49:56 -0000 1.30
@@ -17,8 +17,10 @@
# * generate a config.mak file for use in makefiles
# * ....
-TMPC=scummvm-conf.cpp
-TMPO=scummvm-conf
+# TODO: We should really use mktemp(1) to determine a random tmp file name.
+# However, that tool might not be available everywhere.
+TMPO=/tmp/scummvm-conf
+TMPC=${TMPO}.cpp
TMPLOG=config.log
CFLAGS=""
@@ -292,8 +294,7 @@
ranlib=ar -r
;;
Darwin)
- DEFINES="$DEFINES -DUNIX"
- _def_macosx='#define MACOSX'
+ DEFINES="$DEFINES -DUNIX -DMACOSX"
LIBS="$LIBS -framework QuickTime -framework AudioUnit"
;;
esac
@@ -354,7 +355,7 @@
}
EOF
_need_memalign=yes
-cc_check && ./$TMPO && _need_memalign=no
+cc_check && $TMPO && _need_memalign=no
if test "$_need_memalign" = yes ; then
_def_align='#define SCUMM_NEED_ALIGNMENT'
else
@@ -494,7 +495,6 @@
$_def_simon
$_def_sky
-$_def_macosx
$_def_endianess
$_def_align
More information about the Scummvm-git-logs
mailing list