Skip to content

Commit

Permalink
CONFIGURE: Introduced new engine dependency: highres
Browse files Browse the repository at this point in the history
Some backends like GCW0 do no support graphics >320x240 due to
the hardware limitation (downscaling is possible but it will ruin
the pixel hunting which is often part of the gameplay).

Instead of manually updating the list of engines, we now introduce
a new dependency.

I marked all relevant engines, but some, like tinsel, require more
work with putting their relevant high-res games under USE_HIGHRES
define.
  • Loading branch information
sev- committed Mar 5, 2016
1 parent 8b3f277 commit 23d74fd
Show file tree
Hide file tree
Showing 25 changed files with 59 additions and 25 deletions.
34 changes: 34 additions & 0 deletions configure
Expand Up @@ -162,6 +162,7 @@ _translation=yes
# Default platform settings
_backend=sdl
_16bit=auto
_highres=auto
_savegame_timestamp=auto
_dynamic_modules=no
_elf_loader=no
Expand Down Expand Up @@ -201,6 +202,7 @@ add_feature 16bit "16bit color" "_16bit"
add_feature faad "libfaad" "_faad"
add_feature flac "FLAC" "_flac"
add_feature freetype2 "FreeType2" "_freetype2"
add_feature highres "high resolution" "_highres"
add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg"
add_feature png "PNG" "_png"
Expand Down Expand Up @@ -922,6 +924,7 @@ Optional Features:
--default-dynamic make plugins dynamic by default
--disable-mt32emu don't enable the integrated MT-32 emulator
--disable-16bit don't enable 16bit color support
--disable-highres don't enable support for high resolution engines >320x240
--disable-savegame-timestamp don't use timestamps for blank savegame descriptions
--disable-scalers exclude scalers
--disable-hq-scalers exclude HQ2x and HQ3x scalers
Expand Down Expand Up @@ -1019,6 +1022,8 @@ done # for parm in ...
for ac_option in $@; do
case "$ac_option" in
--disable-16bit) _16bit=no ;;
--enable-highres) _highres=yes ;;
--disable-highres) _highres=no ;;
--disable-savegame-timestamp) _savegame_timestamp=no ;;
--disable-scalers) _build_scalers=no ;;
--disable-hq-scalers) _build_hq_scalers=no ;;
Expand Down Expand Up @@ -3209,6 +3214,26 @@ case $_backend in
;;
esac

#
# Enable High resolution engines (>320x240) support only for backends which support it
#
case $_backend in
gcw0)
if test "$_highres" = yes ; then
_highres=yes
else
_highres=no
fi
;;
*)
if test "$_highres" = no ; then
_highres=no
else
_highres=yes
fi
;;
esac

#
# Enable Event Recorder only for backends that support it
#
Expand Down Expand Up @@ -3521,6 +3546,11 @@ define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
#
define_in_config_if_yes "$_16bit" 'USE_RGB_COLOR'

#
# Check whether High resolution graphics support is requested
#
define_in_config_if_yes "$_highres" 'USE_HIGHRES'

#
# Check whether save games use the current time as default description
#
Expand Down Expand Up @@ -4424,6 +4454,10 @@ if test "$_16bit" = yes ; then
echo_n ", 16bit color"
fi

if test "$_highres" = yes ; then
echo_n ", highres"
fi

if test "$_savegame_timestamp" = yes ; then
echo_n ", savegame timestamp"
fi
Expand Down
2 changes: 1 addition & 1 deletion engines/agos/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine agos "AGOS" yes "agos2" "AGOS 1 games"
add_engine agos2 "AGOS 2 games" yes
add_engine agos2 "AGOS 2 games" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/avalanche/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine avalanche "Lord Avalot d'Argent" no
add_engine avalanche "Lord Avalot d'Argent" no "" "" "highres"
2 changes: 1 addition & 1 deletion engines/composer/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine composer "Magic Composer" yes
add_engine composer "Magic Composer" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/fullpipe/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine fullpipe "Full Pipe" no "" "" "16bit"
add_engine fullpipe "Full Pipe" no "" "" "16bit highres"
2 changes: 1 addition & 1 deletion engines/groovie/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine groovie "Groovie" yes "groovie2" "7th Guest"
add_engine groovie "Groovie" yes "groovie2" "7th Guest" "highres"
add_engine groovie2 "Groovie 2 games" no "" "" "jpeg 16bit"
2 changes: 1 addition & 1 deletion engines/hopkins/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine hopkins "Hopkins FBI" yes "" "" "16bit"
add_engine hopkins "Hopkins FBI" yes "" "" "16bit highres"
2 changes: 1 addition & 1 deletion engines/lastexpress/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine lastexpress "The Last Express" no "" "" "16bit"
add_engine lastexpress "The Last Express" no "" "" "16bit highres"
2 changes: 1 addition & 1 deletion engines/mohawk/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books"
add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books" "highres"
add_engine cstime "Where in Time is Carmen Sandiego?" no
add_engine riven "Riven: The Sequel to Myst" no "" "" "16bit"
add_engine myst "Myst" no
2 changes: 1 addition & 1 deletion engines/mortevielle/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine mortevielle "Mortevielle" yes
add_engine mortevielle "Mortevielle" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/neverhood/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine neverhood "Neverhood" yes
add_engine neverhood "Neverhood" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/pegasus/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine pegasus "The Journeyman Project: Pegasus Prime" yes "" "" "16bit"
add_engine pegasus "The Journeyman Project: Pegasus Prime" yes "" "" "16bit highres"
2 changes: 1 addition & 1 deletion engines/prince/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine prince "The Prince and The Coward" no
add_engine prince "The Prince and The Coward" no "" "" "highres"
4 changes: 2 additions & 2 deletions engines/saga/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine saga "SAGA" yes "ihnm saga2" "ITE"
add_engine ihnm "IHNM" yes
add_engine saga2 "SAGA 2 games" no
add_engine ihnm "IHNM" yes "" "" "highres"
add_engine saga2 "SAGA 2 games" no "" "" "highres"
2 changes: 1 addition & 1 deletion engines/sci/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games"
add_engine sci32 "SCI32 games" no
add_engine sci32 "SCI32 games" no "" "" "highres"
2 changes: 1 addition & 1 deletion engines/scumm/configure.engine
Expand Up @@ -2,4 +2,4 @@
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games"
add_engine scumm_7_8 "v7 & v8 games" yes
add_engine he "HE71+ games" yes
add_engine he "HE71+ games" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/sword1/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine sword1 "Broken Sword" yes
add_engine sword1 "Broken Sword" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/sword2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine sword2 "Broken Sword II" yes
add_engine sword2 "Broken Sword II" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/sword25/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine sword25 "Broken Sword 2.5" yes "" "" "png zlib 16bit"
add_engine sword25 "Broken Sword 2.5" yes "" "" "png zlib 16bit highres"
2 changes: 1 addition & 1 deletion engines/toltecs/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine toltecs "3 Skulls of the Toltecs" yes
add_engine toltecs "3 Skulls of the Toltecs" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/tony/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine tony "Tony Tough and the Night of Roasted Moths" yes "" "" "16bit"
add_engine tony "Tony Tough and the Night of Roasted Moths" yes "" "" "16bit highres"
2 changes: 1 addition & 1 deletion engines/toon/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine toon "Toonstruck" yes
add_engine toon "Toonstruck" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/touche/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres"
2 changes: 1 addition & 1 deletion engines/wintermute/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine wintermute "Wintermute" yes "" "" "jpeg png zlib vorbis 16bit"
add_engine wintermute "Wintermute" yes "" "" "jpeg png zlib vorbis 16bit highres"
2 changes: 1 addition & 1 deletion engines/zvision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit"
add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres"

0 comments on commit 23d74fd

Please sign in to comment.