aboutsummaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-05-06 03:00:26 +0000
committerJordi Vilalta Prat2008-05-06 03:00:26 +0000
commit38a8aa516e0fa315e318801e5399f82e51efa8df (patch)
treec6f7bc89fe2340a846ef891cefc9031cfdb32ec9 /Makefile.common
parent3ac46924e311afb6b02615af04556da823c4f3f3 (diff)
downloadscummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.gz
scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.bz2
scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.zip
Allow static and dynamic plugins to be used at the same time
svn-id: r31888
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common
index ea46b4cca4..5a443644f2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -22,11 +22,11 @@ MODULES := test tools base $(MODULES)
# After the game specific modules follow the shared modules
MODULES += \
- engines \
gui \
graphics \
sound \
common \
+ engines \
backends
ifdef USE_MT32EMU
@@ -182,22 +182,22 @@ DIST_FILES_THEMES:=$(addprefix $(srcdir)/gui/themes/,modern.ini modern.zip class
# Engine data files
DIST_FILES_ENGINEDATA=
-ifndef DISABLE_IGOR
+ifdef ENABLE_IGOR
DIST_FILES_ENGINEDATA+=igor.tbl
endif
-ifndef DISABLE_KYRA
+ifdef ENABLE_KYRA
DIST_FILES_ENGINEDATA+=kyra.dat
endif
-ifndef DISABLE_LURE
+ifdef ENABLE_LURE
DIST_FILES_ENGINEDATA+=lure.dat
endif
-ifndef DISABLE_M4
+ifdef ENABLE_M4
DIST_FILES_ENGINEDATA+=m4.dat
endif
-ifndef DISABLE_QUEEN
+ifdef ENABLE_QUEEN
DIST_FILES_ENGINEDATA+=queen.tbl
endif
-ifndef DISABLE_SKY
+ifdef ENABLE_SKY
DIST_FILES_ENGINEDATA+=sky.cpt
endif
DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))