diff options
| author | Eugene Sandulenko | 2004-03-14 23:37:11 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-03-14 23:37:11 +0000 |
| commit | 2fe422ad0c91ffb3c82d72b4da08b33b8a2a6183 (patch) | |
| tree | 8f5003728bdc0536c77d499437ac97f8bbd71144 | |
| parent | f1cac1545bd543fa52a75f2f6a4b6e0f0024380d (diff) | |
| download | scummvm-rg350-2fe422ad0c91ffb3c82d72b4da08b33b8a2a6183.tar.gz scummvm-rg350-2fe422ad0c91ffb3c82d72b4da08b33b8a2a6183.tar.bz2 scummvm-rg350-2fe422ad0c91ffb3c82d72b4da08b33b8a2a6183.zip | |
Initial SAGA checkin. Disabled by default, enable with --enable-saga
but don't expect it to work.
svn-id: r13280
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | base/plugins.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.h | 4 | ||||
| -rwxr-xr-x | configure | 12 |
4 files changed, 26 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common index 7212d3ec79..b1ad7a57d6 100644 --- a/Makefile.common +++ b/Makefile.common @@ -79,6 +79,12 @@ else MODULES += queen endif +ifdef DISABLE_SAGA +DEFINES += -DDISABLE_SAGA +else +MODULES += saga +endif + # After the game specific modules follow the shared modules MODULES += \ gui \ diff --git a/base/plugins.cpp b/base/plugins.cpp index c106f52d69..5f20262726 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -251,6 +251,10 @@ void PluginManager::loadPlugins() { #ifndef DISABLE_QUEEN LOAD_MODULE("queen", QUEEN); #endif + +#ifndef DISABLE_SAGA + LOAD_MODULE("saga", SAGA); +#endif } void PluginManager::unloadPlugins() { diff --git a/base/plugins.h b/base/plugins.h index 3202941431..6f276743db 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -165,6 +165,10 @@ DECLARE_PLUGIN(SWORD2) DECLARE_PLUGIN(QUEEN) #endif +#ifndef DISABLE_SAGA +DECLARE_PLUGIN(SAGA) +#endif + #endif #endif @@ -38,6 +38,7 @@ _build_sky=yes _build_sword1=yes _build_sword2=yes _build_queen=yes +_build_saga=no _need_memalign=no _build_plugins=no # more defaults @@ -251,6 +252,7 @@ for ac_option in $@; do --disable-sword1) _build_sword1=no ;; --disable-sword2) _build_sword2=no ;; --disable-queen) _build_queen=no ;; + --enable-saga) _build_saga=yes ;; --enable-alsa) _alsa=yes ;; --disable-alsa) _alsa=no ;; --enable-vorbis) _vorbis=yes ;; @@ -443,6 +445,12 @@ else _mak_queen='# DISABLE_QUEEN = 1' fi +if test "$_build_saga" = no ; then + _mak_saga='DISABLE_SAGA = 1' +else + _mak_saga='# DISABLE_SAGA = 1' +fi + if test -n "$_host"; then # Cross-compiling mode - add your target here if needed @@ -789,6 +797,9 @@ fi if test "$_build_queen" = yes ; then echo " Flight of the Amazon Queen" fi +if test "$_build_saga" = yes ; then + echo " SAGA Engine" +fi echo echo_n "Backend... " @@ -874,6 +885,7 @@ $_mak_sky $_mak_sword1 $_mak_sword2 $_mak_queen +$_mak_saga INCLUDES += $INCLUDES OBJS += $OBJS |