Use simply expanded variables.
This commit is contained in:
johns
parent
fdf606c918
commit
00c79730ac
3 changed files with 23 additions and 26 deletions
|
|
@ -46,9 +46,9 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# SDL - Simple DirectMedia Layer configuration (any >=1.0.0)
|
||||
|
||||
SDL_CFLAGS = $(shell sdl-config --cflags)
|
||||
SDLLIB = $(shell sdl-config --static-libs)
|
||||
#SDLLIB = $(shell sdl-config --libs)
|
||||
SDL_CFLAGS := $(shell sdl-config --cflags)
|
||||
SDLLIB := $(shell sdl-config --static-libs)
|
||||
#SDLLIB := $(shell sdl-config --libs)
|
||||
|
||||
# Without SDL Sound (only not win32)
|
||||
#SDL = -DUSE_SDL $(SDL_CFLAGS)
|
||||
|
|
@ -233,7 +233,6 @@ DFLAGS= $(THREAD) $(CCL) $(VERSION) $(VIDEO) $(ZDEFS) $(DSOUND) $(DEBUG) \
|
|||
-DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_AI -DUSE_FLAC -DUSE_OGG -DUSE_MAD \
|
||||
-DUSE_HP_FOR_XP # -DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_SHIPS
|
||||
|
||||
|
||||
## choose optimise level
|
||||
#CFLAGS=-g -O0 $(PROFILE) -pipe -Wcast-align -Wall -Werror $(IFLAGS) $(DFLAGS)
|
||||
#CFLAGS=-g -O1 $(PROFILE) -pipe -Wcast-align -Wall -Werror $(IFLAGS) $(DFLAGS)
|
||||
|
|
|
|||
22
configure
vendored
22
configure
vendored
|
|
@ -486,13 +486,13 @@ case $VIDSEL in
|
|||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS := \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
|
||||
if [ x$STATIC != x ] ; then
|
||||
SDLLIB="\$(shell $SDL_CONFIG --static-libs)"
|
||||
fi
|
||||
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
echo "VIDEO = \$(SDL)" >> $RULESFILE
|
||||
if [ "$BEOS" != 1 ] ; then
|
||||
|
|
@ -515,13 +515,13 @@ case $VIDSEL in
|
|||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS := \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
|
||||
if [ x$STATIC != x ] ; then
|
||||
SDLLIB="$SDLLIB -lesd"
|
||||
fi
|
||||
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
echo "VIDEO = \$(SDL)" >> $RULESFILE
|
||||
echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE
|
||||
|
|
@ -534,11 +534,11 @@ case $VIDSEL in
|
|||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS := \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
if [ x$STATIC != x ] ; then
|
||||
SDLLIB="$SDLLIB -lesd"
|
||||
fi
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
else
|
||||
echo "Using X11..."
|
||||
|
|
@ -600,8 +600,8 @@ case $ANSWER in
|
|||
;;
|
||||
*)
|
||||
HAVEARTS=1
|
||||
echo "ARTSC = -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE
|
||||
echo "ARTSCLIB = \$(shell artsc-config --libs)" >> $RULESFILE
|
||||
echo "ARTSC := -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE
|
||||
echo "ARTSCLIB := \$(shell artsc-config --libs)" >> $RULESFILE
|
||||
echo "Using ARTS Daemon Support..."
|
||||
echo
|
||||
echo -n "Checking for various sound libraries..."
|
||||
|
|
@ -737,8 +737,8 @@ case $ANSWER in
|
|||
USE_LIBCDA=0
|
||||
echo "SDLCD = -DUSE_SDLCD" >> $RULESFILE
|
||||
if [ "$USESDL" != 1 ]; then
|
||||
echo "SDLCD = $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "CLONELIBS = \$(shell $SDL_CONFIG --libs)" >> $RULESFILE
|
||||
echo "SDLCD := $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "CLONELIBS := \$(shell $SDL_CONFIG --libs)" >> $RULESFILE
|
||||
fi
|
||||
echo >> $RULESFILE
|
||||
;;
|
||||
|
|
@ -894,8 +894,6 @@ fi
|
|||
|
||||
|
||||
CCVERS=`$CC -dumpversion`
|
||||
# CCVERS=`echo $CCVERS | sed -e 's/gcc-3.2//'`
|
||||
# CCVERS=`echo $CCVERS | sed -e 's/something that removes (foo)//g'`
|
||||
CCMAJOR=`echo $CCVERS | cut -d. -f 1`
|
||||
CCMINOR=`echo $CCVERS | cut -d. -f 2`
|
||||
CCREALLYMINOR=`echo $CCVERS | cut -d. -f 3`
|
||||
|
|
|
|||
20
setup
20
setup
|
|
@ -467,14 +467,14 @@ case $VIDSEL in
|
|||
echo -n "Using SDL"
|
||||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL := -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
|
||||
if test "$STATIC x" != " x" ; then
|
||||
SDLLIB="\$(shell $SDL_CONFIG --static-libs)"
|
||||
fi
|
||||
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
echo "VIDEO = \$(SDL)" >> $RULESFILE
|
||||
if [ "$BEOS" != "1" ] ; then
|
||||
|
|
@ -498,13 +498,13 @@ case $VIDSEL in
|
|||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS := \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
|
||||
if test "$STATIC x" != " x" ; then
|
||||
SDLLIB="$SDLLIB -lesd"
|
||||
fi
|
||||
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
echo "VIDEO = \$(SDL)" >> $RULESFILE
|
||||
echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE
|
||||
|
|
@ -517,11 +517,11 @@ case $VIDSEL in
|
|||
USESDL=1
|
||||
SDLLIB="\$(shell $SDL_CONFIG --libs)"
|
||||
echo "SDL = -DUSE_SDL -DUSE_SDLA \$(SDL_CFLAGS)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "SDL_CFLAGS := \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
if test "$STATIC x" != " x" ; then
|
||||
SDLLIB="$SDLLIB -lesd"
|
||||
fi
|
||||
echo "SDLLIB = $SDLLIB" >> $RULESFILE
|
||||
echo "SDLLIB := $SDLLIB" >> $RULESFILE
|
||||
echo >> $RULESFILE
|
||||
else
|
||||
echo "Using X11"
|
||||
|
|
@ -578,8 +578,8 @@ case $ANSWER in
|
|||
;;
|
||||
*)
|
||||
HAVEARTS=1
|
||||
echo "ARTSC = -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE
|
||||
echo "ARTSCLIB = \$(shell artsc-config --libs)" >> $RULESFILE
|
||||
echo "ARTSC := -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE
|
||||
echo "ARTSCLIB := \$(shell artsc-config --libs)" >> $RULESFILE
|
||||
echo
|
||||
echo "Compiling with arts daemon support"
|
||||
;;
|
||||
|
|
@ -688,8 +688,8 @@ case $ANSWER in
|
|||
USE_LIBCDA=0
|
||||
echo "SDLCD = -DUSE_SDLCD" >> $RULESFILE
|
||||
if [ "$USESDL" != "1" ]; then
|
||||
echo "SDLCD = $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "CLONELIBS = \$(shell $SDL_CONFIG --libs)" >> $RULESFILE
|
||||
echo "SDLCD := $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
|
||||
echo "CLONELIBS := \$(shell $SDL_CONFIG --libs)" >> $RULESFILE
|
||||
fi
|
||||
echo >> $RULESFILE
|
||||
;;
|
||||
|
|
|
|||
Loading…
Reference in a new issue