diff options
author | Matthew Hoops | 2011-07-18 10:13:50 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-07-18 10:13:50 -0400 |
commit | c4d3a8601021e438fdf877483209fc7488101e4a (patch) | |
tree | 68e7eae439528853dc059a3a41ce393e0be6b2fc | |
parent | a50abde1b1228aa8364349728ad7f4f328d4a2f4 (diff) | |
download | scummvm-rg350-c4d3a8601021e438fdf877483209fc7488101e4a.tar.gz scummvm-rg350-c4d3a8601021e438fdf877483209fc7488101e4a.tar.bz2 scummvm-rg350-c4d3a8601021e438fdf877483209fc7488101e4a.zip |
COMMON: Remove USE_BINK checks from header files
-rw-r--r-- | common/bitstream.h | 10 | ||||
-rw-r--r-- | common/dct.h | 10 | ||||
-rw-r--r-- | common/fft.h | 10 | ||||
-rw-r--r-- | common/huffman.h | 10 | ||||
-rw-r--r-- | common/math.h | 10 | ||||
-rw-r--r-- | common/rdft.h | 10 |
6 files changed, 0 insertions, 60 deletions
diff --git a/common/bitstream.h b/common/bitstream.h index f7ce17c3b5..99aec252a3 100644 --- a/common/bitstream.h +++ b/common/bitstream.h @@ -22,14 +22,6 @@ // 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 @@ -108,5 +100,3 @@ 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 30eae8ca52..a0d625d55d 100644 --- a/common/dct.h +++ b/common/dct.h @@ -26,14 +26,6 @@ // 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 @@ -77,5 +69,3 @@ private: } // End of namespace Common #endif // COMMON_DCT_H - -#endif // USE_BINK diff --git a/common/fft.h b/common/fft.h index e32cd9d927..17d1ef0055 100644 --- a/common/fft.h +++ b/common/fft.h @@ -26,14 +26,6 @@ // 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 @@ -79,5 +71,3 @@ private: } // End of namespace Common #endif // COMMON_FFT_H - -#endif // USE_BINK diff --git a/common/huffman.h b/common/huffman.h index 5e4ad69325..9c88a37541 100644 --- a/common/huffman.h +++ b/common/huffman.h @@ -22,14 +22,6 @@ // 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 @@ -83,5 +75,3 @@ private: } // End of namespace Common #endif // COMMON_HUFFMAN_H - -#endif // USE_BINK diff --git a/common/math.h b/common/math.h index 266dd72f2a..db803d9889 100644 --- a/common/math.h +++ b/common/math.h @@ -22,14 +22,6 @@ // 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 @@ -117,5 +109,3 @@ inline float deg2rad(float deg) { } // End of namespace Common #endif // COMMON_MATHS_H - -#endif // USE_BINK diff --git a/common/rdft.h b/common/rdft.h index 0316f4fb17..33fcdd2b3b 100644 --- a/common/rdft.h +++ b/common/rdft.h @@ -24,14 +24,6 @@ // 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 @@ -70,5 +62,3 @@ private: } // End of namespace Common #endif // COMMON_RDFT_H - -#endif // USE_BINK |