diff options
| -rw-r--r-- | base/plugins.cpp | 52 | ||||
| -rwxr-xr-x | configure | 126 | ||||
| -rw-r--r-- | engines/engines.mk | 84 |
3 files changed, 131 insertions, 131 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index 836ea14c41..0de8baccc6 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -89,50 +89,50 @@ public: #ifndef DISABLE_SCUMM LINK_PLUGIN(SCUMM) #endif - #ifndef DISABLE_SKY - LINK_PLUGIN(SKY) - #endif - #ifndef DISABLE_SWORD1 - LINK_PLUGIN(SWORD1) - #endif - #ifndef DISABLE_SWORD2 - LINK_PLUGIN(SWORD2) + #ifndef DISABLE_AGI + LINK_PLUGIN(AGI) #endif #ifndef DISABLE_AGOS LINK_PLUGIN(AGOS) #endif - #ifndef DISABLE_QUEEN - LINK_PLUGIN(QUEEN) + #ifndef DISABLE_CINE + LINK_PLUGIN(CINE) #endif - #ifndef DISABLE_SAGA - LINK_PLUGIN(SAGA) + #ifndef DISABLE_CRUISE + LINK_PLUGIN(CRUISE) #endif - #ifndef DISABLE_KYRA - LINK_PLUGIN(KYRA) + #ifndef DISABLE_DRASCULA + LINK_PLUGIN(DRASCULA) #endif #ifndef DISABLE_GOB LINK_PLUGIN(GOB) #endif + #ifndef DISABLE_KYRA + LINK_PLUGIN(KYRA) + #endif #ifndef DISABLE_LURE LINK_PLUGIN(LURE) #endif - #ifndef DISABLE_CINE - LINK_PLUGIN(CINE) + #ifndef DISABLE_PARALLACTION + LINK_PLUGIN(PARALLACTION) #endif - #ifndef DISABLE_AGI - LINK_PLUGIN(AGI) + #ifndef DISABLE_QUEEN + LINK_PLUGIN(QUEEN) #endif - #ifndef DISABLE_TOUCHE - LINK_PLUGIN(TOUCHE) + #ifndef DISABLE_SAGA + LINK_PLUGIN(SAGA) #endif - #ifndef DISABLE_PARALLACTION - LINK_PLUGIN(PARALLACTION) + #ifndef DISABLE_SKY + LINK_PLUGIN(SKY) #endif - #ifndef DISABLE_CRUISE - LINK_PLUGIN(CRUISE) + #ifndef DISABLE_SWORD1 + LINK_PLUGIN(SWORD1) #endif - #ifndef DISABLE_DRASCULA - LINK_PLUGIN(DRASCULA) + #ifndef DISABLE_SWORD2 + LINK_PLUGIN(SWORD2) + #endif + #ifndef DISABLE_TOUCHE + LINK_PLUGIN(TOUCHE) #endif return pl; @@ -49,21 +49,21 @@ _mt32emu=yes _build_scumm=yes _build_scumm_7_8=yes _build_he=yes +_build_agi=yes _build_agos=yes -_build_sky=yes -_build_sword1=yes -_build_sword2=yes -_build_queen=yes -_build_saga=yes +_build_cine=yes +_build_cruise=no +_build_drascula=no _build_gob=yes _build_kyra=yes _build_lure=yes -_build_cine=yes -_build_agi=yes -_build_touche=yes _build_parallaction=yes -_build_cruise=no -_build_drascula=no +_build_queen=yes +_build_saga=yes +_build_sky=yes +_build_sword1=yes +_build_sword2=yes +_build_touche=yes _build_hq_scalers=yes _build_scalers=yes @@ -350,6 +350,9 @@ Special configuration feature: Optional Features: --disable-debug disable building with debugging symbols --enable-Werror treat warnings as errors + --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-agi don't build the AGI engine --disable-agos don't build the AGOS engine --disable-cine don't build the Cinematique engine evo 1 @@ -358,12 +361,9 @@ Optional Features: --disable-gob don't build the Gobli*ns engine --disable-kyra don't build the Legend of Kyrandia engine --disable-lure don't build the Lure of the Temptress engine - --disable-he exclude HE70+ games in SCUMM engine --disable-parallaction don't build the Parallaction engine --disable-queen don't build the Flight of the Amazon Queen engine --disable-saga don't build the SAGA engine - --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-sky don't build the Beneath a Steel Sky engine --disable-sword1 don't build the Broken Sword 1 engine --disable-sword2 don't build the Broken Sword 2 engine @@ -426,21 +426,21 @@ for ac_option in $@; do --disable-scumm) _build_scumm=no ;; --disable-scumm-7-8) _build_scumm_7_8=no ;; --disable-he) _build_he=no ;; + --disable-agi) _build_agi=no ;; --disable-agos) _build_agos=no ;; - --disable-sky) _build_sky=no ;; - --disable-sword1) _build_sword1=no ;; - --disable-sword2) _build_sword2=no ;; - --disable-queen) _build_queen=no ;; - --disable-saga) _build_saga=no ;; + --disable-cine) _build_cine=no ;; + --enable-cruise) _build_cruise=yes ;; + --enable-drascula) _build_drascula=yes ;; --disable-gob) _build_gob=no ;; --disable-kyra) _build_kyra=no ;; --disable-lure) _build_lure=no ;; - --disable-cine) _build_cine=no ;; - --disable-agi) _build_agi=no ;; - --disable-touche) _build_touche=no ;; --disable-parallaction) _build_parallaction=no ;; - --enable-cruise) _build_cruise=yes ;; - --enable-drascula) _build_drascula=yes ;; + --disable-queen) _build_queen=no ;; + --disable-saga) _build_saga=no ;; + --disable-sky) _build_sky=no ;; + --disable-sword1) _build_sword1=no ;; + --disable-sword2) _build_sword2=no ;; + --disable-touche) _build_touche=no ;; --disable-hq-scalers) _build_hq_scalers=no ;; --disable-scalers) _build_scalers=no ;; --enable-alsa) _alsa=yes ;; @@ -719,21 +719,21 @@ fi; add_to_config_mk_if_no $_build_scumm 'DISABLE_SCUMM = 1' add_to_config_mk_if_no $_build_scumm_7_8 'DISABLE_SCUMM_7_8 = 1' add_to_config_mk_if_no $_build_he 'DISABLE_HE = 1' +add_to_config_mk_if_no $_build_agi 'DISABLE_AGI = 1' add_to_config_mk_if_no $_build_agos 'DISABLE_AGOS = 1' +add_to_config_mk_if_no $_build_cine 'DISABLE_CINE = 1' +add_to_config_mk_if_no $_build_cruise 'DISABLE_CRUISE = 1' +add_to_config_mk_if_no $_build_drascula 'DISABLE_DRASCULA = 1' +add_to_config_mk_if_no $_build_gob 'DISABLE_GOB = 1' +add_to_config_mk_if_no $_build_kyra 'DISABLE_KYRA = 1' +add_to_config_mk_if_no $_build_lure 'DISABLE_LURE = 1' +add_to_config_mk_if_no $_build_parallaction 'DISABLE_PARALLACTION = 1' +add_to_config_mk_if_no $_build_queen 'DISABLE_QUEEN = 1' +add_to_config_mk_if_no $_build_saga 'DISABLE_SAGA = 1' add_to_config_mk_if_no $_build_sky 'DISABLE_SKY = 1' add_to_config_mk_if_no $_build_sword1 'DISABLE_SWORD1 = 1' add_to_config_mk_if_no $_build_sword2 'DISABLE_SWORD2 = 1' -add_to_config_mk_if_no $_build_queen 'DISABLE_QUEEN = 1' -add_to_config_mk_if_no $_build_kyra 'DISABLE_KYRA = 1' -add_to_config_mk_if_no $_build_saga 'DISABLE_SAGA = 1' -add_to_config_mk_if_no $_build_gob 'DISABLE_GOB = 1' -add_to_config_mk_if_no $_build_lure 'DISABLE_LURE = 1' -add_to_config_mk_if_no $_build_cine 'DISABLE_CINE = 1' -add_to_config_mk_if_no $_build_agi 'DISABLE_AGI = 1' add_to_config_mk_if_no $_build_touche 'DISABLE_TOUCHE = 1' -add_to_config_mk_if_no $_build_parallaction 'DISABLE_PARALLACTION = 1' -add_to_config_mk_if_no $_build_cruise 'DISABLE_CRUISE = 1' -add_to_config_mk_if_no $_build_drascula 'DISABLE_DRASCULA = 1' add_to_config_mk_if_no $_build_hq_scalers 'DISABLE_HQ_SCALERS = 1' add_to_config_mk_if_no $_build_scalers 'DISABLE_SCALERS = 1' @@ -1340,9 +1340,39 @@ if test "$_build_scumm" = yes ; then fi echo fi +if test "$_build_agi" = yes ; then + echo " AGI" +fi if test "$_build_agos" = yes ; then echo " AGOS" fi +if test "$_build_cine" = yes ; then + echo " Cinematique evo 1" +fi +if test "$_build_cruise" = yes ; then + echo " Cinematique evo 2" +fi +if test "$_build_drascula" = yes ; then + echo " Drascula" +fi +if test "$_build_gob" = yes ; then + echo " Gobli*ns" +fi +if test "$_build_kyra" = yes ; then + echo " Legend of Kyrandia" +fi +if test "$_build_lure" = yes ; then + echo " Lure of the Temptress" +fi +if test "$_build_parallaction" = yes ; then + echo " Parallaction" +fi +if test "$_build_queen" = yes ; then + echo " Flight of the Amazon Queen" +fi +if test "$_build_saga" = yes ; then + echo " SAGA" +fi if test "$_build_sky" = yes ; then echo " Beneath a Steel Sky" fi @@ -1362,39 +1392,9 @@ if test "$_build_sword2" = yes ; then echo " (without mpeg2 cutscenes)" fi fi -if test "$_build_queen" = yes ; then - echo " Flight of the Amazon Queen" -fi -if test "$_build_saga" = yes ; then - echo " SAGA" -fi -if test "$_build_kyra" = yes ; then - echo " Legend of Kyrandia" -fi -if test "$_build_gob" = yes ; then - echo " Gobli*ns" -fi -if test "$_build_lure" = yes ; then - echo " Lure of the Temptress" -fi -if test "$_build_cine" = yes ; then - echo " Cinematique evo 1" -fi -if test "$_build_agi" = yes ; then - echo " AGI" -fi if test "$_build_touche" = yes ; then echo " Touche: The Adventures of the Fifth Musketeer" fi -if test "$_build_parallaction" = yes ; then - echo " Parallaction" -fi -if test "$_build_cruise" = yes ; then - echo " Cinematique evo 2" -fi -if test "$_build_drascula" = yes ; then - echo " Drascula" -fi echo diff --git a/engines/engines.mk b/engines/engines.mk index 2d6031ff12..e61537bc02 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -13,40 +13,40 @@ endif endif -ifdef DISABLE_AGOS -DEFINES += -DDISABLE_AGOS +ifdef DISABLE_AGI +DEFINES += -DDISABLE_AGI else -MODULES += engines/agos +MODULES += engines/agi endif -ifdef DISABLE_SKY -DEFINES += -DDISABLE_SKY +ifdef DISABLE_AGOS +DEFINES += -DDISABLE_AGOS else -MODULES += engines/sky +MODULES += engines/agos endif -ifdef DISABLE_SWORD1 -DEFINES += -DDISABLE_SWORD1 +ifdef DISABLE_CINE +DEFINES += -DDISABLE_CINE else -MODULES += engines/sword1 +MODULES += engines/cine endif -ifdef DISABLE_SWORD2 -DEFINES += -DDISABLE_SWORD2 +ifdef DISABLE_CRUISE +DEFINES += -DDISABLE_CRUISE else -MODULES += engines/sword2 +MODULES += engines/cruise endif -ifdef DISABLE_QUEEN -DEFINES += -DDISABLE_QUEEN +ifdef DISABLE_DRASCULA +DEFINES += -DDISABLE_DRASCULA else -MODULES += engines/queen +MODULES += engines/drascula endif -ifdef DISABLE_SAGA -DEFINES += -DDISABLE_SAGA +ifdef DISABLE_GOB +DEFINES += -DDISABLE_GOB else -MODULES += engines/saga +MODULES += engines/gob endif ifdef DISABLE_KYRA @@ -55,50 +55,50 @@ else MODULES += engines/kyra endif -ifdef DISABLE_GOB -DEFINES += -DDISABLE_GOB -else -MODULES += engines/gob -endif - ifdef DISABLE_LURE DEFINES += -DDISABLE_LURE else MODULES += engines/lure endif -ifdef DISABLE_CINE -DEFINES += -DDISABLE_CINE +ifdef DISABLE_PARALLACTION +DEFINES += -DDISABLE_PARALLACTION else -MODULES += engines/cine +MODULES += engines/parallaction endif -ifdef DISABLE_AGI -DEFINES += -DDISABLE_AGI +ifdef DISABLE_QUEEN +DEFINES += -DDISABLE_QUEEN else -MODULES += engines/agi +MODULES += engines/queen endif -ifdef DISABLE_TOUCHE -DEFINES += -DDISABLE_TOUCHE +ifdef DISABLE_SAGA +DEFINES += -DDISABLE_SAGA else -MODULES += engines/touche +MODULES += engines/saga endif -ifdef DISABLE_PARALLACTION -DEFINES += -DDISABLE_PARALLACTION +ifdef DISABLE_SKY +DEFINES += -DDISABLE_SKY else -MODULES += engines/parallaction +MODULES += engines/sky endif -ifdef DISABLE_CRUISE -DEFINES += -DDISABLE_CRUISE +ifdef DISABLE_SWORD1 +DEFINES += -DDISABLE_SWORD1 else -MODULES += engines/cruise +MODULES += engines/sword1 endif -ifdef DISABLE_DRASCULA -DEFINES += -DDISABLE_DRASCULA +ifdef DISABLE_SWORD2 +DEFINES += -DDISABLE_SWORD2 else -MODULES += engines/drascula +MODULES += engines/sword2 +endif + +ifdef DISABLE_TOUCHE +DEFINES += -DDISABLE_TOUCHE +else +MODULES += engines/touche endif |