1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/media/libvpx/vpx_config.h Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,54 @@
1.4 +#if defined(VPX_X86_ASM)
1.5 +
1.6 +#if defined(_WIN64)
1.7 +/* 64 bit Windows */
1.8 +#ifdef _MSC_VER
1.9 +#include "vpx_config_x86_64-win64-vs8.h"
1.10 +#else
1.11 +#include "vpx_config_x86_64-win64-gcc.h"
1.12 +#endif
1.13 +
1.14 +#elif defined(_WIN32)
1.15 +/* 32 bit Windows, MSVC. */
1.16 +#ifdef _MSC_VER
1.17 +#include "vpx_config_x86-win32-vs8.h"
1.18 +#else
1.19 +#include "vpx_config_x86-win32-gcc.h"
1.20 +#endif
1.21 +
1.22 +#elif defined(__APPLE__) && defined(__x86_64__)
1.23 +/* 64 bit MacOS. */
1.24 +#include "vpx_config_x86_64-darwin9-gcc.h"
1.25 +
1.26 +#elif defined(__APPLE__) && defined(__i386__)
1.27 +/* 32 bit MacOS. */
1.28 +#include "vpx_config_x86-darwin9-gcc.h"
1.29 +
1.30 +#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
1.31 +/* 32 bit ELF platforms. */
1.32 +#include "vpx_config_x86-linux-gcc.h"
1.33 +
1.34 +#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
1.35 +/* 64 bit ELF platforms. */
1.36 +#include "vpx_config_x86_64-linux-gcc.h"
1.37 +
1.38 +#else
1.39 +#error VPX_X86_ASM is defined, but assembly not supported on this platform!
1.40 +#endif
1.41 +
1.42 +#elif defined(VPX_ARM_ASM)
1.43 +
1.44 +/* Android */
1.45 +#include "vpx_config_armv7-android-gcc.h"
1.46 +
1.47 +#else
1.48 +/* Assume generic GNU/GCC configuration. */
1.49 +#include "vpx_config_generic-gnu.h"
1.50 +#endif
1.51 +
1.52 +/* Control error-concealment support using our own #define rather than
1.53 + hard-coding it. */
1.54 +#if defined(MOZ_VPX_ERROR_CONCEALMENT)
1.55 +#undef CONFIG_ERROR_CONCEALMENT
1.56 +#define CONFIG_ERROR_CONCEALMENT 1
1.57 +#endif
