diff options
| author | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
|---|---|---|
| committer | Marisa-Chan | 2014-06-13 21:43:04 +0700 |
| commit | 45589950c0fb1a449351e6a00ef10d42290d8bae (patch) | |
| tree | 44e4eedcb7e69d5fc386155b000ed038af07251d /image/module.mk | |
| parent | 48360645dcd5f8fddb135b6e31ae5cae4be8d77f (diff) | |
| parent | 5c005ad3a3f1df0bc968c85c1cf0fc48e36ab0b2 (diff) | |
| download | scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.gz scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.tar.bz2 scummvm-rg350-45589950c0fb1a449351e6a00ef10d42290d8bae.zip | |
Merge remote-tracking branch 'upstream/master' into zvision
Conflicts:
engines/zvision/animation/rlf_animation.cpp
engines/zvision/animation_control.h
engines/zvision/core/console.cpp
engines/zvision/core/events.cpp
engines/zvision/cursors/cursor.cpp
engines/zvision/cursors/cursor_manager.cpp
engines/zvision/cursors/cursor_manager.h
engines/zvision/fonts/truetype_font.cpp
engines/zvision/graphics/render_manager.cpp
engines/zvision/graphics/render_manager.h
engines/zvision/inventory/inventory_manager.h
engines/zvision/inventory_manager.h
engines/zvision/meta_animation.h
engines/zvision/module.mk
engines/zvision/scripting/actions.cpp
engines/zvision/scripting/control.h
engines/zvision/scripting/controls/animation_control.cpp
engines/zvision/scripting/controls/animation_control.h
engines/zvision/scripting/controls/input_control.cpp
engines/zvision/scripting/controls/lever_control.cpp
engines/zvision/scripting/controls/timer_node.cpp
engines/zvision/scripting/controls/timer_node.h
engines/zvision/scripting/puzzle.h
engines/zvision/scripting/scr_file_handling.cpp
engines/zvision/scripting/script_manager.cpp
engines/zvision/scripting/script_manager.h
engines/zvision/sidefx.cpp
engines/zvision/sound/zork_raw.cpp
engines/zvision/sound/zork_raw.h
engines/zvision/video/video.cpp
engines/zvision/video/zork_avi_decoder.h
engines/zvision/zvision.cpp
engines/zvision/zvision.h
Diffstat (limited to 'image/module.mk')
| -rw-r--r-- | image/module.mk | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/image/module.mk b/image/module.mk new file mode 100644 index 0000000000..fdf52ec09f --- /dev/null +++ b/image/module.mk @@ -0,0 +1,31 @@ +MODULE := image + +MODULE_OBJS := \ + bmp.o \ + iff.o \ + jpeg.o \ + pcx.o \ + pict.o \ + png.o \ + tga.o \ + codecs/bmp_raw.o \ + codecs/cdtoons.o \ + codecs/cinepak.o \ + codecs/codec.o \ + codecs/indeo3.o \ + codecs/mjpeg.o \ + codecs/msrle.o \ + codecs/msvideo1.o \ + codecs/qtrle.o \ + codecs/rpza.o \ + codecs/smc.o \ + codecs/svq1.o \ + codecs/truemotion1.o + +ifdef USE_MPEG2 +MODULE_OBJS += \ + codecs/mpeg.o +endif + +# Include common rules +include $(srcdir)/rules.mk |