fixed problems with setup script

This commit is contained in:
nehalmistry 2002-12-06 17:54:22 +00:00
parent b0882e1944
commit 25357bdd01

22
setup
View file

@ -467,14 +467,14 @@ case $VIDSEL in
echo -n "Using SDL" echo -n "Using SDL"
USESDL=1 USESDL=1
SDLLIB="\$(shell $SDL_CONFIG --libs)" 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 echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
if test "$STATIC x" != " x" ; then if test "$STATIC x" != " x" ; then
SDLLIB="\$(shell $SDL_CONFIG --static-libs)" SDLLIB="\$(shell $SDL_CONFIG --static-libs)"
fi fi
echo "SDLLIB := $SDLLIB" >> $RULESFILE echo "SDLLIB = $SDLLIB" >> $RULESFILE
echo >> $RULESFILE echo >> $RULESFILE
echo "VIDEO = \$(SDL)" >> $RULESFILE echo "VIDEO = \$(SDL)" >> $RULESFILE
if [ "$BEOS" != "1" ] ; then if [ "$BEOS" != "1" ] ; then
@ -498,13 +498,13 @@ case $VIDSEL in
USESDL=1 USESDL=1
SDLLIB="\$(shell $SDL_CONFIG --libs)" 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 echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
if test "$STATIC x" != " x" ; then if test "$STATIC x" != " x" ; then
SDLLIB="$SDLLIB -lesd" SDLLIB="$SDLLIB -lesd"
fi fi
echo "SDLLIB := $SDLLIB" >> $RULESFILE echo "SDLLIB = $SDLLIB" >> $RULESFILE
echo >> $RULESFILE echo >> $RULESFILE
echo "VIDEO = \$(SDL)" >> $RULESFILE echo "VIDEO = \$(SDL)" >> $RULESFILE
echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE echo "VIDEOLIB = \$(SDLLIB) -lvga -lvgagl $DL" >> $RULESFILE
@ -517,11 +517,11 @@ case $VIDSEL in
USESDL=1 USESDL=1
SDLLIB="\$(shell $SDL_CONFIG --libs)" 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 echo "SDL_CFLAGS = \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
if test "$STATIC x" != " x" ; then if test "$STATIC x" != " x" ; then
SDLLIB="$SDLLIB -lesd" SDLLIB="$SDLLIB -lesd"
fi fi
echo "SDLLIB := $SDLLIB" >> $RULESFILE echo "SDLLIB = $SDLLIB" >> $RULESFILE
echo >> $RULESFILE echo >> $RULESFILE
else else
echo "Using X11" echo "Using X11"
@ -578,8 +578,8 @@ case $ANSWER in
;; ;;
*) *)
HAVEARTS=1 HAVEARTS=1
echo "ARTSC := -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE echo "ARTSC = -DWITH_ARTSC \$(shell artsc-config --cflags)" >> $RULESFILE
echo "ARTSCLIB := \$(shell artsc-config --libs)" >> $RULESFILE echo "ARTSCLIB = \$(shell artsc-config --libs)" >> $RULESFILE
echo echo
echo "Compiling with arts daemon support" echo "Compiling with arts daemon support"
;; ;;
@ -688,8 +688,8 @@ case $ANSWER in
USE_LIBCDA=0 USE_LIBCDA=0
echo "SDLCD = -DUSE_SDLCD" >> $RULESFILE echo "SDLCD = -DUSE_SDLCD" >> $RULESFILE
if [ "$USESDL" != "1" ]; then if [ "$USESDL" != "1" ]; then
echo "SDLCD := $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE echo "SDLCD = $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE
echo "CLONELIBS := \$(shell $SDL_CONFIG --libs)" >> $RULESFILE echo "CLONELIBS = \$(shell $SDL_CONFIG --libs)" >> $RULESFILE
fi fi
echo >> $RULESFILE echo >> $RULESFILE
;; ;;