mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-18 11:38:08 +00:00
cc6074ad33
+ Fix libvpx and zrtp compilation for XCode 4.x Overall, we transition from using gcc to using clang all the way. This solves some tricky problems with -mtune options and architecture-dependant configure issues.
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index c99a01c..f7f54c6 100755
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -889,13 +889,13 @@ process_common_toolchain() {
|
|
SDK_PATH=${sdk_path}
|
|
fi
|
|
TOOLCHAIN_PATH=${SDK_PATH}/usr/bin
|
|
- CXX=${TOOLCHAIN_PATH}/g++
|
|
- CC=${TOOLCHAIN_PATH}/gcc
|
|
- AR=${TOOLCHAIN_PATH}/ar
|
|
- LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2
|
|
- AS=${TOOLCHAIN_PATH}/as
|
|
- STRIP=${TOOLCHAIN_PATH}/strip
|
|
- NM=${TOOLCHAIN_PATH}/nm
|
|
+ CXX=`xcrun --find clang++`
|
|
+ CC=`xcrun --find clang`
|
|
+ AR=`xcrun --find ar`
|
|
+ LD=`xcrun --find clang`
|
|
+ AS=`xcrun --find as`
|
|
+ STRIP=`xcrun --find strip`
|
|
+ NM=`xcrun --find nm`
|
|
AS_SFX=.s
|
|
|
|
# ASFLAGS is written here instead of using check_add_asflags
|
|
@@ -904,7 +904,7 @@ process_common_toolchain() {
|
|
ASFLAGS="-version -arch ${tgt_isa} -g"
|
|
|
|
add_cflags -arch ${tgt_isa}
|
|
- add_ldflags -arch_only ${tgt_isa}
|
|
+ add_ldflags -arch ${tgt_isa}
|
|
|
|
if [ -z "${alt_libc}" ]; then
|
|
alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk
|
|
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
|
|
index a4a00f6..72d0b6d 100644
|
|
--- a/vp8/decoder/decodframe.c
|
|
+++ b/vp8/decoder/decodframe.c
|
|
@@ -92,7 +92,7 @@ void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
|
|
}
|
|
}
|
|
|
|
-static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
|
|
+void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
|
|
unsigned int mb_idx)
|
|
{
|
|
MB_PREDICTION_MODE mode;
|