diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/scumm/module.mk | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/scumm/module.mk')
| -rw-r--r-- | engines/scumm/module.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index 7ae4577432..7d52a02116 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -64,7 +64,7 @@ MODULE_OBJS += \ proc3ARM.o endif -ifndef DISABLE_SCUMM_7_8 +ifdef ENABLE_SCUMM_7_8 MODULE_OBJS += \ nut_renderer.o \ script_v8.o \ @@ -104,7 +104,7 @@ MODULE_OBJS += \ gfxARM.o endif -ifndef DISABLE_HE +ifdef ENABLE_HE MODULE_OBJS += \ he/animation_he.o \ he/cup_player_he.o \ @@ -121,7 +121,7 @@ MODULE_OBJS += \ endif # This module can be built as a plugin -ifdef BUILD_PLUGINS +ifeq ($(ENABLE_SCUMM), DYNAMIC_PLUGIN) PLUGIN := 1 endif |