diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2011-11-22 03:57:34 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2011-11-22 03:57:34 +0400 |
| commit | 4eef78d2a676a4893395569a2ca45c94e4f5793d (patch) | |
| tree | 5a17b5d60be4339eb353443958f5c9f4f6d3270d /3rdparty | |
| parent | 192ae7804a7c21af77faa1899a9ea78296be5528 (diff) | |
Actually *use* the CELT's config.h. Also crank up optimization build settings. Hopefully this fixes the CELT crashes.
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj | 31 | ||||
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/config.h | 14 |
2 files changed, 40 insertions, 5 deletions
diff --git a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj index 9386e51..7080f3c 100644 --- a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj +++ b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj @@ -323,13 +323,19 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_FAST_MATH = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_CONFIG_H, + DEBUG, + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_UNROLL_LOOPS = NO; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = .; IPHONEOS_DEPLOYMENT_TARGET = 4.3; SDKROOT = iphoneos; }; @@ -340,10 +346,15 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_FAST_MATH = YES; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_UNROLL_LOOPS = YES; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = .; IPHONEOS_DEPLOYMENT_TARGET = 4.3; SDKROOT = iphoneos; }; @@ -384,10 +395,15 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_FAST_MATH = YES; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_UNROLL_LOOPS = YES; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = .; IPHONEOS_DEPLOYMENT_TARGET = 4.3; SDKROOT = iphoneos; }; @@ -477,10 +493,15 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_FAST_MATH = YES; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_UNROLL_LOOPS = YES; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = .; IPHONEOS_DEPLOYMENT_TARGET = 4.3; SDKROOT = iphoneos; }; diff --git a/3rdparty/celt-0.7.0-build/config.h b/3rdparty/celt-0.7.0-build/config.h index ab1ab5c..11e70f4 100644 --- a/3rdparty/celt-0.7.0-build/config.h +++ b/3rdparty/celt-0.7.0-build/config.h @@ -1,2 +1,16 @@ +#define CELT_BUILD /**/ +#define CELT_EXTRA_VERSION "" +#define CELT_MAJOR_VERSION 0 +#define CELT_MICRO_VERSION 0 +#define CELT_MINOR_VERSION 7 +#define CELT_VERSION "0.7.0" #define FLOATING_POINT #define VAR_ARRAYS +#define HAVE_LRINTF 1 +#define HAVE_LRINT 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +#define STDC_HEADERS 1
\ No newline at end of file |