[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.99,1.100 NEWS,1.120,1.121 configure,1.121,1.122
Eugene Sandulenko
sev at users.sourceforge.net
Sat May 14 15:57:53 CEST 2005
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362
Modified Files:
Makefile.common NEWS configure
Log Message:
Added --disable-hq and --disable-scumm-7-8 options. Also improved
DISABLE_HE so more HE-specific code gets excluded.
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- Makefile.common 14 May 2005 14:06:33 -0000 1.99
+++ Makefile.common 14 May 2005 22:56:36 -0000 1.100
@@ -37,12 +37,17 @@
DEFINES += -DDISABLE_SCUMM
else
MODULES += scumm
+
+ifdef DISABLE_SCUMM_7_8
+DEFINES += -DDISABLE_SCUMM_7_8
endif
ifdef DISABLE_HE
DEFINES += -DDISABLE_HE
endif
+endif
+
ifdef DISABLE_SIMON
DEFINES += -DDISABLE_SIMON
else
@@ -103,6 +108,10 @@
MODULES += sound/softsynth/mt32
endif
+ifdef DISABLE_HQ_SCALERS
+DEFINES += -DDISABLE_HQ_SCALERS
+endif
+
######################################################################
# The build rules follow - normally you should have no need to
# touch whatever comes after here.
Index: NEWS
===================================================================
RCS file: /cvsroot/scummvm/scummvm/NEWS,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- NEWS 13 May 2005 08:37:11 -0000 1.120
+++ NEWS 14 May 2005 22:56:36 -0000 1.121
@@ -28,6 +28,8 @@
- Added support for NES version of Maniac Mansion
- Added thumbnail support for savegames.
- Broke compatibility with HE savegame (HE v71 and upwards only)
+ - Added possibility to disable building of HE and SCUMM v7 & v8 games
+ support.
Sword2:
- Made the resource manager expire resources more intelligently.
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- configure 14 May 2005 14:06:33 -0000 1.121
+++ configure 14 May 2005 22:56:36 -0000 1.122
@@ -24,6 +24,7 @@
_mt32emu=yes
# default option behaviour yes/no
_build_scumm=yes
+_build_scumm_7_8=yes
_build_he=yes
_build_simon=yes
_build_sky=yes
@@ -36,6 +37,7 @@
_need_memalign=no
_build_plugins=no
_nasm=auto
+_build_hq_scalers=yes
# more defaults
_backend=sdl
_ranlib=ranlib
@@ -264,6 +266,7 @@
Optional Features:
--disable-debug disable building with debugging symbols
--disable-scumm don't build the SCUMM engine
+ --disable-scumm-7-8 exclude v7 and v8 game in SCUMM engine (ft, dig, comi and demos)
--disable-he exclude HE70+ games in SCUMM engine
--disable-simon don't build the simon engine
--disable-sky don't build the Beneath a Steel Sky engine
@@ -276,6 +279,7 @@
--enable-plugins build engines as loadable modules instead of
static linking them
--disable-mt32emu don't enable the integrated MT-32 emulator
+ --disable-hq-scalers exclude HQ2x and HQ3x scalers
Optional Libraries:
--with-alsa-prefix=DIR Prefix where alsa is installed (optional)
@@ -323,6 +327,7 @@
for ac_option in $@; do
case "$ac_option" in
--disable-scumm) _build_scumm=no ;;
+ --disable-scumm-7-8) _build_scumm_7_8=no ;;
--disable-he) _build_he=no ;;
--disable-simon) _build_simon=no ;;
--disable-sky) _build_sky=no ;;
@@ -332,6 +337,7 @@
--disable-saga) _build_saga=no ;;
--disable-gob) _build_gob=no ;;
--enable-kyra) _build_kyra=yes ;;
+ --disable-hq-scalers) _build_hq_scalers=no ;;
--enable-alsa) _alsa=yes ;;
--disable-alsa) _alsa=no ;;
--enable-vorbis) _vorbis=yes ;;
@@ -426,6 +432,13 @@
esac;
done;
+if test "$_build_he" = yes ; then
+ if test "$_build_scumm_7_8" != yes ; then
+ echo "error: you cannot enable HE games with SCUMM v7 & v8 disabled"
+ exit 1
+ fi
+fi
+
CXXFLAGS="$CXXFLAGS $DEBFLAGS"
case $_host in
@@ -559,6 +572,12 @@
_mak_scumm='# DISABLE_SCUMM = 1'
fi
+if test "$_build_scumm_7_8" = no ; then
+ _mak_scumm_7_8='DISABLE_SCUMM_7_8 = 1'
+else
+ _mak_scumm_7_8='# DISABLE_SCUMM_7_8 = 1'
+fi
+
if test "$_build_he" = no ; then
_mak_he='DISABLE_HE = 1'
else
@@ -613,6 +632,12 @@
_mak_gob='# DISABLE_GOB = 1'
fi
+if test "$_build_hq_scalers" = no ; then
+ _mak_hq_scalers='DISABLE_HQ_SCALERS = 1'
+else
+ _mak_hq_scalers='# DISABLE_HQ_SCALERS = 1'
+fi
+
if test -n "$_host"; then
# Cross-compiling mode - add your target here if needed
case "$_host" in
@@ -1072,10 +1097,14 @@
echo
echo "Engines:"
if test "$_build_scumm" = yes ; then
- echo " SCUMM"
+ echo_n " SCUMM"
+ if test "$_build_scumm_7_8" = yes ; then
+ echo_n " [v7 & v8 games]"
+ fi
if test "$_build_he" = yes ; then
- echo " SCUMM (HE70+ games)"
+ echo_n " [HE70+ games]"
fi
+ echo
fi
if test "$_build_simon" = yes ; then
echo " Simon the Sorcerer"
@@ -1118,11 +1147,18 @@
echo_n "$_backend"
if test "$_nasm" = yes ; then
- echo ", assembly routines"
+ echo_n ", assembly routines"
+fi
+
+if test "$_build_hq_scalers" = yes ; then
+ echo_n ", HQ scalers"
+fi
+
+if test "$_mt32emu" = yes ; then
+ echo ", MT-32 emu"
else
echo
fi
-
#
# Backend related stuff
#
@@ -1230,6 +1266,7 @@
$_make_def_HAVE_GCC3
$_make_def_HAVE_NASM
$_mak_scumm
+$_mak_scumm_7_8
$_mak_he
$_mak_simon
$_mak_sky
@@ -1241,6 +1278,8 @@
$_mak_gob
$_mak_mt32emu
+$_mak_hq_scalers
+
INCLUDES += $INCLUDES
OBJS += $OBJS
DEFINES += $DEFINES
More information about the Scummvm-git-logs
mailing list