diff options
| author | Max Horn | 2002-08-24 16:26:09 +0000 |
|---|---|---|
| committer | Max Horn | 2002-08-24 16:26:09 +0000 |
| commit | 69cca0906e4c5c4321570e5a85f1a76a98dff744 (patch) | |
| tree | 6ad7285e2fea34dcfa8eb1eacc3c009a5552e0b5 | |
| parent | 657f6a86f523c248dedcdd8f17073ff6f1d05ca1 (diff) | |
| download | scummvm-rg350-69cca0906e4c5c4321570e5a85f1a76a98dff744.tar.gz scummvm-rg350-69cca0906e4c5c4321570e5a85f1a76a98dff744.tar.bz2 scummvm-rg350-69cca0906e4c5c4321570e5a85f1a76a98dff744.zip | |
fixed the Makefile buildsystem for now to link in the new Smush player, and disabling the old Smush player
svn-id: r4826
| -rw-r--r-- | Makefile.common | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index 224c8a3584..4ea562409f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -17,14 +17,31 @@ GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \ SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \ scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \ - scumm/insane.o scumm/object.o scumm/resource.o scumm/resource_v3.o \ + scumm/object.o scumm/resource.o scumm/resource_v3.o \ scumm/resource_v4.o scumm/saveload.o scumm/script.o \ scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o scumm/string.o \ - scumm/sys.o scumm/vars.o scumm/verbs.o + scumm/sys.o scumm/vars.o scumm/verbs.o \ +# scumm/insane.o SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \ simon/sys.o simon/verb.o simon/vga.o +SMUSH_OBJS = scumm/smush/blitter.o \ + scumm/smush/brenderer.o \ + scumm/smush/chunck.o \ + scumm/smush/codec1.o \ + scumm/smush/codec37.o \ + scumm/smush/codec44.o \ + scumm/smush/codec47.o \ + scumm/smush/color.o \ + scumm/smush/frenderer.o \ + scumm/smush/imuse_channel.o \ + scumm/smush/palette.o \ + scumm/smush/player.o \ + scumm/smush/rect.o \ + scumm/smush/saud_channel.o \ + scumm/smush/scumm_renderer.o + SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o OBJS += $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS) @@ -38,7 +55,7 @@ all: scummvm$(EXEEXT) scummvm$(EXEEXT): $(OBJS) $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) -scumm/libscumm.a: $(SCUMM_OBJS) +scumm/libscumm.a: $(SCUMM_OBJS) $(SMUSH_OBJS) $(AR) $@ $+ $(RANLIB) $@ |