diff options
| author | Strangerke | 2012-10-10 08:26:41 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:26:41 +0200 |
| commit | b164cbb571fc4e0f2a6f002760a851d8ac592540 (patch) | |
| tree | 4d25f2e1f8241f6f3352fd9fb1135f5faa36dfd4 /common/module.mk | |
| parent | b2f2f8d7b08b40e43702e8db325f8136066f10be (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.gz scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.bz2 scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into mortevielle
Conflicts:
base/plugins.cpp
configure
Diffstat (limited to 'common/module.mk')
| -rw-r--r-- | common/module.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/module.mk b/common/module.mk index b4928fabda..d96b11ee40 100644 --- a/common/module.mk +++ b/common/module.mk @@ -4,6 +4,7 @@ MODULE_OBJS := \ archive.o \ config-file.o \ config-manager.o \ + coroutines.o \ dcl.o \ debug.o \ error.o \ @@ -15,6 +16,7 @@ MODULE_OBJS := \ gui_options.o \ hashmap.o \ iff_container.o \ + installshield_cab.o \ language.o \ localization.o \ macresman.o \ @@ -41,7 +43,6 @@ MODULE_OBJS := \ xmlparser.o \ zlib.o -ifdef USE_BINK MODULE_OBJS += \ cosinetables.o \ dct.o \ @@ -49,7 +50,6 @@ MODULE_OBJS += \ huffman.o \ rdft.o \ sinetables.o -endif # Include common rules include $(srcdir)/rules.mk |