diff options
| author | Matthew Hoops | 2011-07-13 12:08:26 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-13 12:08:26 -0400 |
| commit | a50abde1b1228aa8364349728ad7f4f328d4a2f4 (patch) | |
| tree | 497d8f5037e80959a07da83dd3aa5f0f36194571 /video | |
| parent | 7dc727131682806c9bd97ba1099ee2291c21a7a6 (diff) | |
| download | scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.tar.gz scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.tar.bz2 scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.zip | |
BUILD: Allow for disabling Bink support
Diffstat (limited to 'video')
| -rw-r--r-- | video/bink_decoder.h | 8 | ||||
| -rw-r--r-- | video/module.mk | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/video/bink_decoder.h b/video/bink_decoder.h index 8cb447749d..ceb55391a9 100644 --- a/video/bink_decoder.h +++ b/video/bink_decoder.h @@ -24,6 +24,10 @@ // based quite heavily on the Bink decoder found in FFmpeg. // Many thanks to Kostya Shishkov for doing the hard work. +#include "common/scummsys.h" + +#ifdef USE_BINK + #ifndef VIDEO_BINK_DECODER_H #define VIDEO_BINK_DECODER_H @@ -325,4 +329,6 @@ private: } // End of namespace Video -#endif +#endif // VIDEO_BINK_DECODER_H + +#endif // USE_BINK diff --git a/video/module.mk b/video/module.mk index 98c84e3516..ceeac94384 100644 --- a/video/module.mk +++ b/video/module.mk @@ -2,7 +2,6 @@ MODULE := video MODULE_OBJS := \ avi_decoder.o \ - bink_decoder.o \ coktel_decoder.o \ dxa_decoder.o \ flic_decoder.o \ @@ -20,5 +19,10 @@ MODULE_OBJS := \ codecs/smc.o \ codecs/truemotion1.o +ifdef USE_BINK +MODULE_OBJS += \ + bink_decoder.o +endif + # Include common rules include $(srcdir)/rules.mk |