From 7d7b78938e6cc2268b93affb99005cee3eedf8f8 Mon Sep 17 00:00:00 2001 From: def Date: Tue, 28 Oct 2014 09:51:15 +0100 Subject: [PATCH] Fix opus compilation --- bam.lua | 29 ++++--- src/engine/external/ogg/os_types.h | 126 ++--------------------------- 2 files changed, 23 insertions(+), 132 deletions(-) diff --git a/bam.lua b/bam.lua index 24b5db969..abd33cd49 100644 --- a/bam.lua +++ b/bam.lua @@ -183,25 +183,28 @@ function build(settings) opus_settings = settings:Copy() opus_settings.cc.flags:Add("-DHAVE_CONFIG_H") - opus_settings.cc.includes:Add("src/engine/external/opus/") - opus_settings.cc.includes:Add("src/engine/external/opus/celt/") - opus_settings.cc.includes:Add("src/engine/external/opus/silk/") - opus_settings.cc.includes:Add("src/engine/external/opus/silk/float/") - opus_settings.cc.includes:Add("src/engine/external/opus/silk/fixed/") - opus_settings.cc.includes:Add("src/engine/external/opus/silk/arm/") - opus_settings.cc.includes:Add("src/engine/external/opus/celt/arm/") - opus_settings.cc.includes:Add("src/engine/external/opus/celt/x86/") + opus_settings.cc.includes:Add("src/engine/external/opus") + opus_settings.cc.includes:Add("src/engine/external/opus/celt") + opus_settings.cc.includes:Add("src/engine/external/opus/silk") + opus_settings.cc.includes:Add("src/engine/external/opus/silk/float") + opus_settings.cc.includes:Add("src/engine/external/opus/silk/fixed") + opus_settings.cc.includes:Add("src/engine/external/opus/silk/arm") + opus_settings.cc.includes:Add("src/engine/external/opus/celt/arm") + opus_settings.cc.includes:Add("src/engine/external/opus/celt/x86") opusfile_settings = settings:Copy() - opusfile_settings.cc.includes:Add("src/engine/external/opus/") - opusfile_settings.cc.includes:Add("src/engine/external/ogg/") - opusfile_settings.cc.includes:Add("src/engine/external/opusfile/") + opusfile_settings.cc.includes:Add("src/engine/external") + opusfile_settings.cc.includes:Add("src/engine/external/ogg") + opusfile_settings.cc.includes:Add("src/engine/external/opus") + opusfile_settings.cc.includes:Add("src/engine/external/opusfile") - settings.cc.includes:Add("src/engine/external/opus/") - settings.cc.includes:Add("src/engine/external/ogg/") + settings.cc.includes:Add("src/engine/external/opus") + settings.cc.includes:Add("src/engine/external/ogg") -- set some platform specific settings settings.cc.includes:Add("src") + settings.cc.includes:Add("src/engine/external") + settings.cc.includes:Add("src/engine/external/opus") settings.cc.includes:Add("other/mysql/include") if family == "unix" then diff --git a/src/engine/external/ogg/os_types.h b/src/engine/external/ogg/os_types.h index 8bf82107e..f5ea869ca 100644 --- a/src/engine/external/ogg/os_types.h +++ b/src/engine/external/ogg/os_types.h @@ -24,124 +24,12 @@ #define _ogg_realloc realloc #define _ogg_free free -#if defined(_WIN32) - -# if defined(__CYGWIN__) -# include - typedef int16_t ogg_int16_t; - typedef uint16_t ogg_uint16_t; - typedef int32_t ogg_int32_t; - typedef uint32_t ogg_uint32_t; - typedef int64_t ogg_int64_t; - typedef uint64_t ogg_uint64_t; -# elif defined(__MINGW32__) -# include - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - typedef unsigned long long ogg_uint64_t; -# elif defined(__MWERKS__) - typedef long long ogg_int64_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; -# else - /* MSVC/Borland */ - typedef __int64 ogg_int64_t; - typedef __int32 ogg_int32_t; - typedef unsigned __int32 ogg_uint32_t; - typedef __int16 ogg_int16_t; - typedef unsigned __int16 ogg_uint16_t; -# endif - -#elif defined(__MACOS__) - -# include - typedef SInt16 ogg_int16_t; - typedef UInt16 ogg_uint16_t; - typedef SInt32 ogg_int32_t; - typedef UInt32 ogg_uint32_t; - typedef SInt64 ogg_int64_t; - -#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ - -# include - typedef int16_t ogg_int16_t; - typedef uint16_t ogg_uint16_t; - typedef int32_t ogg_int32_t; - typedef uint32_t ogg_uint32_t; - typedef int64_t ogg_int64_t; - -#elif defined(__HAIKU__) - - /* Haiku */ -# include - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - -#elif defined(__BEOS__) - - /* Be */ -# include - typedef int16_t ogg_int16_t; - typedef uint16_t ogg_uint16_t; - typedef int32_t ogg_int32_t; - typedef uint32_t ogg_uint32_t; - typedef int64_t ogg_int64_t; - -#elif defined (__EMX__) - - /* OS/2 GCC */ - typedef short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - -#elif defined (DJGPP) - - /* DJGPP */ - typedef short ogg_int16_t; - typedef int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long ogg_int64_t; - -#elif defined(R5900) - - /* PS2 EE */ - typedef long ogg_int64_t; - typedef int ogg_int32_t; - typedef unsigned ogg_uint32_t; - typedef short ogg_int16_t; - -#elif defined(__SYMBIAN32__) - - /* Symbian GCC */ - typedef signed short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef signed int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long int ogg_int64_t; - -#elif defined(__TMS320C6X__) - - /* TI C64x compiler */ - typedef signed short ogg_int16_t; - typedef unsigned short ogg_uint16_t; - typedef signed int ogg_int32_t; - typedef unsigned int ogg_uint32_t; - typedef long long int ogg_int64_t; - -#else - -# include - -#endif +#include +typedef int16_t ogg_int16_t; +typedef uint16_t ogg_uint16_t; +typedef int32_t ogg_int32_t; +typedef uint32_t ogg_uint32_t; +typedef int64_t ogg_int64_t; +typedef uint64_t ogg_uint64_t; #endif /* _OS_TYPES_H */