diff options
| -rw-r--r-- | XBMC-ATV2.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | XBMC-IOS.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | XBMC.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | tools/depends/configure.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index 39307912a9..0c4ac95183 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -6623,7 +6623,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "PATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; + shellScript = "if [ -d \"/Users/Shared/xbmc-depends/buildtools-native/bin\" ]; then\nPATH=$PATH:/Users/Shared/xbmc-depends/buildtools-native/bin\nelse\nPATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\nfi\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; }; F589B48B128A696700D8079E /* copy root files */ = { isa = PBXShellScriptBuildPhase; diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj index 900b70488c..0c992b996f 100644 --- a/XBMC-IOS.xcodeproj/project.pbxproj +++ b/XBMC-IOS.xcodeproj/project.pbxproj @@ -6697,7 +6697,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "PATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; + shellScript = "if [ -d \"/Users/Shared/xbmc-depends/buildtools-native/bin\" ]; then\nPATH=$PATH:/Users/Shared/xbmc-depends/buildtools-native/bin\nelse\nPATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\nfi\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; }; F589B48B128A696700D8079E /* copy root files */ = { isa = PBXShellScriptBuildPhase; diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index c1466ed67e..5d1fc8e822 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -6711,7 +6711,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -d \"/Users/Shared/xbmc-depends/$(SDK_NAME)_$(CURRENT_ARCH)/toolchain/bin\" ]; then\nPATH=$PATH:/Users/Shared/xbmc-depends/$(SDK_NAME)_$(CURRENT_ARCH)/toolchain/bin\nelse\nPATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\nfi\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; + shellScript = "if [ -d \"/Users/Shared/xbmc-depends/buildtools-native/bin\" ]; then\nPATH=$PATH:/Users/Shared/xbmc-depends/buildtools-native/bin\nelse\nPATH=$PATH:/Users/Shared/xbmc-depends/toolchain/bin\nfi\n\nif [ \"$ACTION\" = build ] ; then\nmake -f ${SRCROOT}/codegenerator.mk\nfi"; }; F5DEC3580E6DEBB2005A4E24 /* copy root files */ = { isa = PBXShellScriptBuildPhase; diff --git a/tools/depends/configure.in b/tools/depends/configure.in index 19ab0dbe89..f376e9f97c 100644 --- a/tools/depends/configure.in +++ b/tools/depends/configure.in @@ -235,7 +235,7 @@ case $host in platform_ldflags+=" -arch $use_cpu -m$platform_min_version -isysroot $use_sdk_path " platform_cxxflags="$platform_cflags" deps_dir=$sdk_name"_"$use_cpu - tool_dir=toolchain; + tool_dir=buildtools-native; ;; *) AC_MSG_ERROR(unsupported host ($use_host)) |