diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/module.mk | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/module.mk')
| -rw-r--r-- | engines/kyra/module.mk | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk index abd535ee29..21e3ba3dff 100644 --- a/engines/kyra/module.mk +++ b/engines/kyra/module.mk @@ -9,6 +9,7 @@ MODULE_OBJS := \ debugger.o \ detection.o \ gui.o \ + gui_v1.o \ gui_lok.o \ gui_v2.o \ gui_hof.o \ @@ -72,8 +73,19 @@ MODULE_OBJS := \ vqa.o \ wsamovie.o +KYRARPG_COMMON_OBJ = \ + gui_rpg.o \ + kyra_rpg.o \ + saveload_rpg.o \ + scene_rpg.o \ + sprites_rpg.o \ + staticres_rpg.o \ + text_rpg.o \ + timer_rpg.o + ifdef ENABLE_LOL MODULE_OBJS += \ + $(KYRARPG_COMMON_OBJ) \ gui_lol.o \ items_lol.o \ lol.o \ @@ -89,6 +101,30 @@ MODULE_OBJS += \ timer_lol.o endif +ifdef ENABLE_EOB +ifndef ENABLE_LOL +MODULE_OBJS += \ + $(KYRARPG_COMMON_OBJ) +endif +MODULE_OBJS += \ + chargen.o \ + eobcommon.o \ + eob.o \ + darkmoon.o \ + gui_eob.o \ + items_eob.o \ + magic_eob.o \ + saveload_eob.o \ + scene_eob.o \ + screen_eob.o \ + script_eob.o \ + sequences_eob.o \ + sequences_darkmoon.o \ + sprites_eob.o \ + staticres_eob.o \ + timer_eob.o +endif + # This module can be built as a plugin ifeq ($(ENABLE_KYRA), DYNAMIC_PLUGIN) PLUGIN := 1 |