diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/sherlock/module.mk | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/sherlock/module.mk')
| -rw-r--r-- | engines/sherlock/module.mk | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk new file mode 100644 index 0000000000..32c5d3acc3 --- /dev/null +++ b/engines/sherlock/module.mk @@ -0,0 +1,71 @@ +MODULE := engines/sherlock + +MODULE_OBJS = \ + scalpel/darts.o \ + scalpel/scalpel.o \ + scalpel/3do/movie_decoder.o \ + scalpel/drivers/adlib.o \ + scalpel/drivers/mt32.o \ + scalpel/tsage/logo.o \ + scalpel/tsage/resources.o \ + scalpel/scalpel_debugger.o \ + scalpel/scalpel_fixed_text.o \ + scalpel/scalpel_inventory.o \ + scalpel/scalpel_journal.o \ + scalpel/scalpel_map.o \ + scalpel/scalpel_people.o \ + scalpel/scalpel_saveload.o \ + scalpel/scalpel_scene.o \ + scalpel/scalpel_screen.o \ + scalpel/scalpel_talk.o \ + scalpel/scalpel_user_interface.o \ + scalpel/settings.o \ + tattoo/tattoo.o \ + tattoo/tattoo_darts.o \ + tattoo/tattoo_debugger.o \ + tattoo/tattoo_fixed_text.o \ + tattoo/tattoo_inventory.o \ + tattoo/tattoo_journal.o \ + tattoo/tattoo_map.o \ + tattoo/tattoo_people.o \ + tattoo/tattoo_resources.o \ + tattoo/tattoo_scene.o \ + tattoo/tattoo_talk.o \ + tattoo/tattoo_user_interface.o \ + tattoo/widget_base.o \ + tattoo/widget_inventory.o \ + tattoo/widget_lab.o \ + tattoo/widget_talk.o \ + tattoo/widget_text.o \ + tattoo/widget_tooltip.o \ + tattoo/widget_verbs.o \ + animation.o \ + debugger.o \ + detection.o \ + events.o \ + fixed_text.o \ + fonts.o \ + image_file.o \ + inventory.o \ + journal.o \ + map.o \ + music.o \ + objects.o \ + people.o \ + resources.o \ + saveload.o \ + scene.o \ + screen.o \ + sherlock.o \ + sound.o \ + surface.o \ + talk.o \ + user_interface.o + +# This module can be built as a plugin +ifeq ($(ENABLE_SHERLOCK), DYNAMIC_PLUGIN) +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/rules.mk |