BUILD: Allow for disabling Bink support

7 files changed, 70 insertions, 6 deletions

diff --git a/common/bitstream.h b/common/bitstream.h
index 99aec252a3..f7ce17c3b5 100644
--- a/common/bitstream.h
+++ b/common/bitstream.h
@@ -22,6 +22,14 @@
 
 // Based on eos' BitStream implementation
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "BitStream support disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_BITSTREAM_H
 #define COMMON_BITSTREAM_H
 
@@ -100,3 +108,5 @@ private:
 } // End of namespace Common
 
 #endif // COMMON_BITSTREAM_H
+
+#endif // USE_BINK
\ No newline at end of file
diff --git a/common/dct.h b/common/dct.h
index a0d625d55d..30eae8ca52 100644
--- a/common/dct.h
+++ b/common/dct.h
@@ -26,6 +26,14 @@
 // Copyright (c) 2010 Alex Converse <alex.converse@gmail.com>
 // Copyright (c) 2010 Vitor Sessak
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "DCT support disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_DCT_H
 #define COMMON_DCT_H
 
@@ -69,3 +77,5 @@ private:
 } // End of namespace Common
 
 #endif // COMMON_DCT_H
+
+#endif // USE_BINK
diff --git a/common/fft.h b/common/fft.h
index 17d1ef0055..e32cd9d927 100644
--- a/common/fft.h
+++ b/common/fft.h
@@ -26,6 +26,14 @@
 // Copyright (c) 2002 Fabrice Bellard
 // Partly based on libdjbfft by D. J. Bernstein
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "FFT support disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_FFT_H
 #define COMMON_FFT_H
 
@@ -71,3 +79,5 @@ private:
 } // End of namespace Common
 
 #endif // COMMON_FFT_H
+
+#endif // USE_BINK
diff --git a/common/huffman.h b/common/huffman.h
index 9c88a37541..5e4ad69325 100644
--- a/common/huffman.h
+++ b/common/huffman.h
@@ -22,6 +22,14 @@
 
 // Based on eos' Huffman code
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "Huffman support disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_HUFFMAN_H
 #define COMMON_HUFFMAN_H
 
@@ -75,3 +83,5 @@ private:
 } // End of namespace Common
 
 #endif // COMMON_HUFFMAN_H
+
+#endif // USE_BINK
diff --git a/common/math.h b/common/math.h
index db803d9889..266dd72f2a 100644
--- a/common/math.h
+++ b/common/math.h
@@ -22,6 +22,14 @@
 
 // Based on eos' math code
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "Math functions disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_MATH_H
 #define COMMON_MATH_H
 
@@ -109,3 +117,5 @@ inline float deg2rad(float deg) {
 } // End of namespace Common
 
 #endif // COMMON_MATHS_H
+
+#endif // USE_BINK
diff --git a/common/module.mk b/common/module.mk
index 31d91c8fe0..885a4f851a 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -2,30 +2,24 @@ MODULE := common
 
 MODULE_OBJS := \
 	archive.o \
-	bitstream.o \
 	config-file.o \
 	config-manager.o \
 	dcl.o \
-	dct.o \
 	debug.o \
 	error.o \
 	EventDispatcher.o \
 	EventRecorder.o \
-	fft.o \
 	file.o \
 	fs.o \
 	hashmap.o \
-	huffman.o \
 	iff_container.o \
 	macresman.o \
-	math.o \
 	memorypool.o \
 	md5.o \
 	mutex.o \
 	quicktime.o \
 	random.o \
 	rational.o \
-	rdft.o \
 	str.o \
 	stream.o \
 	system.o \
@@ -41,5 +35,15 @@ MODULE_OBJS := \
 	xmlparser.o \
 	zlib.o
 
+ifdef USE_BINK
+MODULE_OBJS += \
+	bitstream.o \
+	dct.o \
+	fft.o \
+	huffman.o \
+	math.o \
+	rdft.o
+endif
+
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/common/rdft.h b/common/rdft.h
index 33fcdd2b3b..0316f4fb17 100644
--- a/common/rdft.h
+++ b/common/rdft.h
@@ -24,6 +24,14 @@
 // Based upon the (I)RDFT code in FFmpeg
 // Copyright (c) 2009 Alex Converse <alex dot converse at gmail dot com>
 
+#include "common/scummsys.h"
+
+#ifndef USE_BINK
+
+#error "RDFT support disabled because Bink support is disabled"
+
+#else
+
 #ifndef COMMON_RDFT_H
 #define COMMON_RDFT_H
 
@@ -62,3 +70,5 @@ private:
 } // End of namespace Common
 
 #endif // COMMON_RDFT_H
+
+#endif // USE_BINK