diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/engines.mk | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/engines.mk')
| -rw-r--r-- | engines/engines.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/engines.mk b/engines/engines.mk index bf0c24c57d..74a5dce1d6 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -99,11 +99,6 @@ DEFINES += -DENABLE_LURE=$(ENABLE_LURE) MODULES += engines/lure endif -ifdef ENABLE_M4 -DEFINES += -DENABLE_M4=$(ENABLE_M4) -MODULES += engines/m4 -endif - ifdef ENABLE_MADE DEFINES += -DENABLE_MADE=$(ENABLE_MADE) MODULES += engines/made @@ -198,6 +193,11 @@ DEFINES += -DENABLE_TINSEL=$(ENABLE_TINSEL) MODULES += engines/tinsel endif +ifdef ENABLE_TOLTECS +DEFINES += -DENABLE_TOLTECS=$(ENABLE_TOLTECS) +MODULES += engines/toltecs +endif + ifdef ENABLE_TOON DEFINES += -DENABLE_TOON=$(ENABLE_TOON) MODULES += engines/toon |