From 55e5f2d9f2e96925cd3a3ad53d9d742520d40b68 Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Sun, 14 Apr 2002 03:12:42 +0000
Subject: [PATCH] cdrom support prompted only if sound support is enabled

---
 setup | 66 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/setup b/setup
index 43fb98927..ad47cf1a3 100755
--- a/setup
+++ b/setup
@@ -148,7 +148,8 @@ while test $# != 0 ; do
       echo
       echo "usage: setup [--static] [--unix] [--beos] [--win32] [--darwin] [--debug] [--profile]"
       echo
-      echo "Setup will create a Rules.make file that Freecraft needs to compile."
+      echo "Setup will create a Rules.make file (or Rules.make.WIN32"
+      echo "if --win32 forced) that Freecraft needs to compile."
       echo "Supported command-line arguments (you may use more than one at a time):"
       echo "  static  : Compile Freecraft using static libraries (default dynamic)"
       echo "  unix    : Force Unix/Linux compile options (default auto check)"
@@ -600,6 +601,35 @@ case $ANSWER in
 	    *)
 		;;
 	esac
+
+	echo
+	echo -n "Would you like to use [n]one or [i]nternal or [S]DL CD Audio support? (n) "
+	read CDMode
+	case $CDMode in
+	    [sS])
+		echo "Using SDL cdrom support"
+		USE_SDLCD=1
+		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
+		fi
+		echo >> $RULESFILE
+		;;
+	    [iI])
+		echo "Using internal cdrom support"
+		USE_SDLCD=0
+		USE_LIBCDA=1
+		echo "LIBCDA          = -DUSE_LIBCDA" >> $RULESFILE
+		echo >> $RULESFILE
+		;;
+	    *)
+		echo "Using none cdrom support"
+		USE_SDLCD=0
+		USE_LIBCDA=0
+		;;
+	esac
 	
   ;;
 esac
@@ -607,40 +637,6 @@ esac
 echo >> $RULESFILE
 echo
 
-#------------------------------------------------------------------------------
-#	CDRom options part
-#------------------------------------------------------------------------------
-echo -n "Would you like to use [n]one or [i]nternal or [S]DL CD Audio support? (n) "
-read CDMode
-case $CDMode in
-  [sS])
-    echo "Using SDL cdrom support"
-    echo
-    USE_SDLCD=1
-    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
-    fi
-    echo >> $RULESFILE
-    ;;
-  [iI])
-    echo "Using internal cdrom support"
-    echo
-    USE_SDLCD=0
-    USE_LIBCDA=1
-    echo "LIBCDA          = -DUSE_LIBCDA" >> $RULESFILE
-    echo >> $RULESFILE
-    ;;
-  *)
-    echo "Using none cdrom support"
-    echo
-    USE_SDLCD=0
-    USE_LIBCDA=0
-    ;;
-esac
-
 #------------------------------------------------------------------------------
 #	Compression options part
 #------------------------------------------------------------------------------