more cleanups; have setup accept CFLAGS and LDFLAGS

This commit is contained in:
nehalmistry 2003-03-31 00:43:00 +00:00
parent ac5aedda64
commit a742111fd2

9
setup
View file

@ -28,7 +28,8 @@
##-----------------------------------------------------------------------------
## HERE ARE SOME USER-CONFIGURABLE VARIABLES
EXTRA_CFLAGS="-DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP"
EXTRA_CFLAGS="$CFLAGS -DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP"
EXTRA_LDFLAGS="$LDFLAGS"
## These could be used for experimental versions
## ---------------------------------------------
@ -691,7 +692,9 @@ case $ANSWER in
if test "$HAVESDL" = "1" ; then
echo " S - SDL driver (known to have problems with some drives)"
fi
if test "$UNIX" = "1" ; then
echo " C - CDDA driver"
fi
echo " N - None"
echo
echo -n "Please enter selection: (n) "
@ -756,7 +759,6 @@ fi
# Display menu
echo "COMPRESSION OPTIONS"
echo
echo " N - None"$DEF1
if test "$HAVE_LIBZ" = 1 ; then
echo " G - GZ"$DEF2
@ -1050,7 +1052,8 @@ if [ "$BEOS" != 1 ] ; then
# Libraries needed to build freecraft
echo "CLONELIBS=$CLONELIBS \$(XLDFLAGS) -lpng -lz -lm \\" >> $RULESFILE
echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS) \\" >> $RULESFILE
echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) -lz -lm" >> $RULESFILE
echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) \\" >> $RULESFILE
echo " $EXTRA_LDFLAGS -lz -lm" >> $RULESFILE
else
# Libraries needed to build tools
echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz \$(THREADLIB)" >> $RULESFILE