fix xcode 10 compatibility issues, fixes issues #60 and #106

tanersener · Mar 29, 2019 · 71ec510 · 71ec510
1 parent 738b93c
commit 71ec510
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 deletions.
diff --git a/build/ios-chromaprint.sh b/build/ios-chromaprint.sh
@@ -57,9 +57,10 @@ cmake -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/${LIB_NAME}" \
     -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_OSX_SYSROOT="" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DFFT_LIB=kissfft \
     -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \

diff --git a/build/ios-common.sh b/build/ios-common.sh
@@ -305,6 +305,9 @@ get_app_specific_cflags() {
         ffmpeg)
             APP_FLAGS="-Wno-unused-function -Wno-deprecated-declarations"
         ;;
+        jpeg)
+            APP_FLAGS="-Wno-nullability-completeness"
+        ;;
         kvazaar)
             APP_FLAGS="-std=gnu99 -Wno-unused-function"
         ;;
@@ -1026,10 +1029,10 @@ set_toolchain_clang_paths() {
 
     TARGET_HOST=$(get_target_host)
 
-    export AR="$(xcrun --sdk $(get_sdk_name) -f ar)"
-    export CC="$(xcrun --sdk $(get_sdk_name) -f clang)"
-    export OBJC="$(xcrun --sdk $(get_sdk_name) -f clang)"
-    export CXX="$(xcrun --sdk $(get_sdk_name) -f clang++)"
+    export AR="ar"
+    export CC="clang"
+    export OBJC="clang"
+    export CXX="clang++"
 
     LOCAL_ASMFLAGS="$(get_asmflags $1)"
     case ${ARCH} in
@@ -1056,9 +1059,9 @@ set_toolchain_clang_paths() {
         ;;
     esac
 
-    export LD="$(xcrun --sdk $(get_sdk_name) -f ld)"
-    export RANLIB="$(xcrun --sdk $(get_sdk_name) -f ranlib)"
-    export STRIP="$(xcrun --sdk $(get_sdk_name) -f strip)"
+    export LD="ld"
+    export RANLIB="ranlib"
+    export STRIP="strip"
 
     export INSTALL_PKG_CONFIG_DIR="${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/pkgconfig"
     export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"

diff --git a/build/ios-jpeg.sh b/build/ios-jpeg.sh
@@ -40,6 +40,16 @@ export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export ASM_FLAGS=$(get_asmflags ${LIB_NAME})
 
+SIMD_OPTIONS=""
+case ${ARCH} in
+    armv7 | armv7s | arm64 | arm64e)
+        SIMD_OPTIONS="-DWITH_SIMD=1"
+    ;;
+    *)
+        SIMD_OPTIONS="-DWITH_SIMD=0"
+    ;;
+esac
+
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 if [ -d "build" ]; then
@@ -62,15 +72,16 @@ cmake -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/${LIB_NAME}" \
     -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_OSX_SYSROOT="" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_ASM_FLAGS="$ASM_FLAGS" \
     -DENABLE_PIC=1 \
     -DENABLE_STATIC=1 \
     -DENABLE_SHARED=0 \
     -DWITH_JPEG8=1 \
-    -DWITH_SIMD=1 \
+    ${SIMD_OPTIONS} \
     -DWITH_TURBOJPEG=0 \
     -DWITH_JAVA=0 \
     -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \

diff --git a/build/ios-libaom.sh b/build/ios-libaom.sh
@@ -89,7 +89,7 @@ cmake -Wno-dev \
     -DCMAKE_CXX_COMPILER="$CXX" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
     ${ARCH_OPTIONS} \

diff --git a/build/ios-libvidstab.sh b/build/ios-libvidstab.sh
@@ -69,7 +69,7 @@ cmake -Wno-dev \
     -DCMAKE_SYSTEM_NAME=Darwin \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DUSE_OMP=0 \
     ${ASM_FLAGS} \

diff --git a/build/ios-libwebp.sh b/build/ios-libwebp.sh
@@ -63,9 +63,10 @@ cmake -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/${LIB_NAME}" \
     -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_OSX_SYSROOT="" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DGIF_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/giflib/include \
     -DJPEG_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/jpeg/include \

diff --git a/build/ios-snappy.sh b/build/ios-snappy.sh
@@ -57,10 +57,11 @@ cmake -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_build_directory)/${LIB_NAME}" \
     -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_OSX_SYSROOT="" \
     -DCMAKE_CXX_COMPILER="$CXX" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DSNAPPY_BUILD_TESTS=0 \
     -DHAVE_LIBLZO2=0 \

diff --git a/build/ios-soxr.sh b/build/ios-soxr.sh
@@ -59,7 +59,7 @@ cmake -Wno-dev \
     -DCMAKE_SYSTEM_NAME=Generic \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DBUILD_TESTS=0 \
     -DWITH_DEV_TRACE=0 \

diff --git a/build/ios-x265.sh b/build/ios-x265.sh
@@ -119,7 +119,7 @@ cmake -Wno-dev \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_CXX_COMPILER="$CXX" \
     -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
+    -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
     -DCMAKE_AS="$AS" \
     -DSTATIC_LINK_CRT=1 \
     -DENABLE_PIC=1 \