diff options
| -rw-r--r-- | cmake/scripts/ios/Install.cmake | 2 | ||||
| -rw-r--r-- | docs/README.ios.md | 4 | ||||
| -rw-r--r-- | docs/README.osx.md | 4 | ||||
| -rwxr-xr-x | tools/darwin/Support/Codesign.command | 4 | ||||
| -rw-r--r-- | tools/darwin/packaging/ios/mkdeb-ios.sh.in | 10 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 2 |
6 files changed, 12 insertions, 14 deletions
diff --git a/cmake/scripts/ios/Install.cmake b/cmake/scripts/ios/Install.cmake index b23e9e58bd..fee7368921 100644 --- a/cmake/scripts/ios/Install.cmake +++ b/cmake/scripts/ios/Install.cmake @@ -64,7 +64,7 @@ add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD "WRAPPER_EXTENSION=app" "SRCROOT=${CMAKE_BINARY_DIR}" ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-ios.command - COMMAND "XBMC_DEPENDS_ROOT=${NATIVEPREFIX}/.." + COMMAND "NATIVEPREFIX=${NATIVEPREFIX}" "PLATFORM_NAME=${PLATFORM}" "CODESIGNING_FOLDER_PATH=$<TARGET_FILE_DIR:${APP_NAME_LC}>" "BUILT_PRODUCTS_DIR=$<TARGET_FILE_DIR:${APP_NAME_LC}>/.." diff --git a/docs/README.ios.md b/docs/README.ios.md index e2494ce9d7..6ae19c8c94 100644 --- a/docs/README.ios.md +++ b/docs/README.ios.md @@ -133,10 +133,10 @@ used to configure CMake. mkdir $HOME/Kodi/build cd $HOME/Kodi/build - /Users/Shared/xbmc-depends/buildtools-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/iphoneos9.3_armv7-target/share/Toolchain.cmake .. + /Users/Shared/xbmc-depends/x86_64-darwin15.6.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/iphoneos9.3_armv7-target/share/Toolchain.cmake .. The toolchain file location differs depending on your iOS and SDK version and -you have to replace `iphoneos9.3_armv7` in the filename above with the correct +you have to replace `x86_64-darwin15.6.0-native` and `iphoneos9.3_armv7` in the filename above with the correct file on your system. Check the directory content to get the filename. #### 4.1.2 Compilation using Xcode diff --git a/docs/README.osx.md b/docs/README.osx.md index f16d794b7d..3ef981278c 100644 --- a/docs/README.osx.md +++ b/docs/README.osx.md @@ -131,10 +131,10 @@ used to configure CMake. mkdir $HOME/Kodi/build cd $HOME/Kodi/build - /Users/Shared/xbmc-depends/buildtools-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.12_x86_64-target/share/Toolchain.cmake .. + /Users/Shared/xbmc-depends/x86_64-darwin15.6.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.12_x86_64-target/share/Toolchain.cmake .. The toolchain file location differs depending on your macOS and SDK version and -you have to replace `macosx10.12_x86_64` in the filename above with the correct +you have to replace `x86_64-darwin15.6.0-native` and `macosx10.12_x86_64` in the filename above with the correct file on your system. Check the directory content to get the filename. #### 4.1.2 Compilation using Xcode diff --git a/tools/darwin/Support/Codesign.command b/tools/darwin/Support/Codesign.command index 528f74a0be..07fde9b126 100755 --- a/tools/darwin/Support/Codesign.command +++ b/tools/darwin/Support/Codesign.command @@ -7,8 +7,8 @@ LIST_BINARY_EXTENSIONS="dylib so" export CODESIGN_ALLOCATE=`xcodebuild -find codesign_allocate` -GEN_ENTITLEMENTS="$XBMC_DEPENDS_ROOT/buildtools-native/bin/gen_entitlements.py" -LDID="$XBMC_DEPENDS_ROOT/buildtools-native/bin/ldid" +GEN_ENTITLEMENTS="$NATIVEPREFIX/bin/gen_entitlements.py" +LDID="$NATIVEPREFIX/bin/ldid" if [ ! -f ${GEN_ENTITLEMENTS} ]; then echo "error: $GEN_ENTITLEMENTS not found. Codesign won't work." diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in index 4e9212688f..6aee2b042e 100644 --- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in +++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in @@ -4,7 +4,7 @@ set -ex # usage: ./mkdeb-ios.sh release/debug (case insensitive) # Allows us to run mkdeb-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/ios folder only -XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@ +NATIVEPREFIX=@NATIVEPREFIX@ SWITCH=`echo $1 | tr [A-Z] [a-z]` DIRNAME=`dirname $0` DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms @@ -44,14 +44,14 @@ fi # also check for SIP (System Integrity Protection) here (via csrutil) - fakeroot et al are not working when it is enabled # fall back to oldschool sudo in that case -if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" -a "`csrutil status | grep enabled`"x == "x" ]; then - SUDO="${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" +if [ -f "${NATIVEPREFIX}/bin/fakeroot" -a "`csrutil status | grep enabled`"x == "x" ]; then + SUDO="${NATIVEPREFIX}/bin/fakeroot" elif [ -f "/usr/bin/sudo" ]; then SUDO="/usr/bin/sudo" fi -if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then +if [ -f "${NATIVEPREFIX}/bin/dpkg-deb" ]; then # make sure we pickup our tar, gnutar will fail when dpkg -i - bin_path=$(cd ${XBMC_DEPENDS_ROOT}/buildtools-native/bin; pwd) + bin_path=$(cd ${NATIVEPREFIX}/bin; pwd) export PATH=${bin_path}:${PATH} fi diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index 82c126cfed..dd9e93958a 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -253,7 +253,6 @@ case $host in if test "x$prefix" = "xNONE"; then prefix=/Users/Shared/xbmc-depends fi - use_tarballs="${use_tarballs:-$prefix/tarballs}" use_xcodepath=`xcode-select -print-path` use_xcodebuild=$use_xcodepath/usr/bin/xcodebuild use_xcode=[`$use_xcodebuild -version | grep Xcode | awk '{ print $2}'`] @@ -413,7 +412,6 @@ case $host in platform_cxxflags+=" -arch $use_cpu -m$platform_min_version -std=c++11 -stdlib=libc++" platform_includes="-isysroot $use_sdk_path" deps_dir="${sdk_name}_${use_cpu}-target-${build_type}" - tool_dir=buildtools-native; AC_CHECK_LIB([z], [main], has_zlib=1, AC_MSG_WARN("No zlib support in toolchain. Will build libz."); has_zlib=0) ;; *) |