aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMax Horn2003-07-06 10:49:56 +0000
committerMax Horn2003-07-06 10:49:56 +0000
commitd27f45d35e850d47bf655f7869e400e6058f2a3b (patch)
tree399683318c37a27f9fba1dc0bb12845b8151f023 /configure
parent98027c207225fc2de1e400b88b325943e8278522 (diff)
downloadscummvm-rg350-d27f45d35e850d47bf655f7869e400e6058f2a3b.tar.gz
scummvm-rg350-d27f45d35e850d47bf655f7869e400e6058f2a3b.tar.bz2
scummvm-rg350-d27f45d35e850d47bf655f7869e400e6058f2a3b.zip
#define MACOSX on the command line, not in config.h; add TODO regarding TMP file names
svn-id: r8799
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 2b974578a6..a9246124a9 100755
--- a/configure
+++ b/configure
@@ -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 @@ case $hosttype in
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 @@ int main(int argc, char **argv)
}
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_scumm
$_def_simon
$_def_sky
-$_def_macosx
$_def_endianess
$_def_align