diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2014-01-26 16:16:27 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2014-01-26 16:16:45 +0400 |
| commit | 5e8d5ca8e2d4d4ee081cf41d0108ec8efb35fea3 (patch) | |
| tree | e6083f964584d21dfd64d4aed5aaa082ed6c48c3 | |
| parent | 673b8df2761291dff158de5d3096475bfc4ae5f8 (diff) | |
3rdparty/opusbuild, 3rdparty/celt-0.7.0, 3rdparty/celt-0.7.0-build: build CELT 0.7.0 as C++ instead of Opus.
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | 3rdparty/celt-0.7.0 | 0 | ||||
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/config.h | 3 | ||||
| -rw-r--r-- | 3rdparty/opusbuild/Base.xcconfig | 3 | ||||
| -rw-r--r-- | 3rdparty/opusbuild/config.h | 2 |
6 files changed, 5 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index bad21da..2b48d37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git://git.xiph.org/speex.git/ [submodule "3rdparty/celt-0.7.0"] path = 3rdparty/celt-0.7.0 - url = git://git.xiph.org/celt.git/ + url = git://github.com/mumble-voip/celt-0.7.0.git [submodule "3rdparty/protobuf"] path = 3rdparty/protobuf url = git://github.com/booyah/protobuf-objc.git diff --git a/3rdparty/celt-0.7.0 b/3rdparty/celt-0.7.0 -Subproject 6c79a9325c328f86fa048bf124ff6a8912a60a3 +Subproject 411011be8ed13ee21053527772f95c2182a85d5 diff --git a/3rdparty/celt-0.7.0-build/Base.xcconfig b/3rdparty/celt-0.7.0-build/Base.xcconfig index 068a633..ce41b9b 100644 --- a/3rdparty/celt-0.7.0-build/Base.xcconfig +++ b/3rdparty/celt-0.7.0-build/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 5.0 +OTHER_CFLAGS = -x c++ + HEADER_SEARCH_PATHS = . ALWAYS_SEARCH_USER_PATHS = NO diff --git a/3rdparty/celt-0.7.0-build/config.h b/3rdparty/celt-0.7.0-build/config.h index 11e70f4..6d10c94 100644 --- a/3rdparty/celt-0.7.0-build/config.h +++ b/3rdparty/celt-0.7.0-build/config.h @@ -13,4 +13,5 @@ #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 +#define STDC_HEADERS 1 +#define restrict diff --git a/3rdparty/opusbuild/Base.xcconfig b/3rdparty/opusbuild/Base.xcconfig index 094d4ab..9b87316 100644 --- a/3rdparty/opusbuild/Base.xcconfig +++ b/3rdparty/opusbuild/Base.xcconfig @@ -8,9 +8,6 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 5.0 -//OTHER_LDFLAGS = -x c++ -OTHER_CFLAGS = -x c++ - HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../opus/silk/float" "$(PROJECT_DIR)/../opus/silk" "$(PROJECT_DIR)/../opus/include" "$(PROJECT_DIR)/../opus/celt" ALWAYS_SEARCH_USER_PATHS = YES diff --git a/3rdparty/opusbuild/config.h b/3rdparty/opusbuild/config.h index aaaa04a..d65f711 100644 --- a/3rdparty/opusbuild/config.h +++ b/3rdparty/opusbuild/config.h @@ -11,5 +11,3 @@ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 #define STDC_HEADERS 1 - -#define restrict |