[Scummvm-cvs-logs] CVS: scummvm configure,1.19,1.20 Makefile.new,1.2,1.3 Makefile.common,1.48,1.49
Jonathan Gray
khalek at users.sourceforge.net
Sun May 25 22:19:05 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv18745
Modified Files:
configure Makefile.new Makefile.common
Log Message:
add ability to choose backend from configure script, doesn't validate user input at the moment
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure 20 May 2003 10:24:24 -0000 1.19
+++ configure 26 May 2003 05:18:40 -0000 1.20
@@ -30,8 +30,10 @@
_build_simon=yes
_build_sky=yes
_need_memalign=no
-# binary names
+# more defaults
+_backend=sdl
_ranlib=ranlib
+_sdlconfig=sdl-config
cc_check() {
echo >> "$TMPLOG"
@@ -126,6 +128,7 @@
Configuration:
-h, --help display this help and exit
+ --backend=BACKEND backend to build (sdl, x11, morphos, dc, gp32) [sdl]
Optional Features:
--disable-scumm don't build the SCUMM engine
@@ -142,8 +145,8 @@
fi
done # for parm in ...
-for x in $@; do
- case $x in
+for ac_option in $@; do
+ case "$ac_option" in
--disable-scumm) _build_scumm=no ;;
--disable-simon) _build_simon=no ;;
--disable-sky) _build_sky=no ;;
@@ -153,6 +156,10 @@
--disable-vorbis) _vorbis=no ;;
--enable-mad) _mad=yes ;;
--disable-mad) _mad=no ;;
+
+ --backend=*)
+ _backend=`echo $ac_option | cut -d '=' -f 2`
+ ;;
esac;
done;
@@ -351,6 +358,9 @@
fi
echo
+echo -n "Backend... "
+echo "$_backend"
+echo
echo "Creating config.h"
cat > config.h << EOF
@@ -394,5 +404,6 @@
CXX := $CXX
LIBS := $LIBS
RANLIB := $_ranlib
+BACKEND := $_backend
EOF
Index: Makefile.new
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.new,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.new 20 May 2003 10:24:24 -0000 1.2
+++ Makefile.new 26 May 2003 05:18:40 -0000 1.3
@@ -44,9 +44,8 @@
$(RM) $(ZIPFILE)
$(ZIP) $(ZIPFILE) $(DISTFILES)
-# Until we add a nice configure tool, default to the SDL build rules
build.rules:
- $(CP) backends/sdl/build.rules build.rules
+ $(CP) backends/$(BACKEND)/build.rules build.rules
deb:
ln -sf dists/debian;
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile.common 26 Apr 2003 11:44:13 -0000 1.48
+++ Makefile.common 26 May 2003 05:18:40 -0000 1.49
@@ -98,4 +98,4 @@
distclean: clean
$(RM_REC) $(DEPDIRS)
- $(RM) build.rules config.h
+ $(RM) build.rules config.h config.mak
More information about the Scummvm-git-logs
mailing list