edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix opus compilation

Browse source
This commit is contained in:
def 2014-10-28 09:51:15 +01:00
parent f4231100a7
commit 7d7b78938e
2 changed files with 23 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bam.lua
View file

@ -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

126
src/engine/external/ogg/os_types.h vendored
View file

@ -24,124 +24,12 @@
#define _ogg_realloc realloc
#define _ogg_free free
#if defined(_WIN32)
# if defined(__CYGWIN__)
# include <stdint.h>
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 <sys/types.h>
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 <sys/types.h>
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 <inttypes.h>
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 <sys/types.h>
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 <inttypes.h>
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 <ogg/config_types.h>
#endif
#include <stdint.h>
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 */