aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore6
-rw-r--r--XBMC.xcodeproj/project.pbxproj6
-rw-r--r--configure.in10
-rwxr-xr-xtools/buildsteps/atv2/package2
-rwxr-xr-xtools/buildsteps/ios/package2
-rw-r--r--tools/darwin/Configurations/App.xcconfig.in (renamed from tools/darwin/Configurations/App.xcconfig)2
-rw-r--r--tools/darwin/Configurations/Common.xcconfig.in (renamed from tools/darwin/Configurations/Common.xcconfig)2
-rw-r--r--[-rwxr-xr-x]tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in (renamed from tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh)7
-rw-r--r--[-rwxr-xr-x]tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in (renamed from tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh)7
9 files changed, 29 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index ee9275801d..2e145835f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -516,6 +516,12 @@ lib/cpluff/stamp-h1
/tools/EventClients/Clients/OSXRemote/build/
/tools/EventClients/Clients/WiiRemote/WiiRemote
+# /tools/darwin/
+/tools/darwin/Configurations/App.xcconfig
+/tools/darwin/Configurations/Common.xcconfig
+/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
+/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
+
# /tools/Linux/
/tools/Linux/xbmc.sh
/tools/Linux/xbmc-standalone.sh
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 0f052a75a5..5e32a357a4 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -14360,7 +14360,6 @@
USE_HEADERMAP = NO;
WARNING_CFLAGS = "";
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
ZERO_LINK = NO;
};
name = Debug;
@@ -14427,7 +14426,6 @@
USE_HEADERMAP = NO;
WARNING_CFLAGS = "";
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
ZERO_LINK = NO;
};
name = Release;
@@ -14466,7 +14464,6 @@
PRODUCT_NAME = XBMC.app;
SDKROOT = macosx;
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
};
name = Debug;
};
@@ -14481,7 +14478,6 @@
PRODUCT_NAME = XBMC.app;
SDKROOT = macosx;
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
ZERO_LINK = NO;
};
name = Release;
@@ -14542,7 +14538,6 @@
VALID_ARCHS = armv7;
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
};
name = Debug;
};
@@ -14604,7 +14599,6 @@
VALID_ARCHS = armv7;
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "$(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(ARCHS)-target";
- XBMC_DEPENDS_ROOT = "/Users/Shared/xbmc-depends";
ZERO_LINK = NO;
};
name = Release;
diff --git a/configure.in b/configure.in
index 3c026ea367..8adde48932 100644
--- a/configure.in
+++ b/configure.in
@@ -626,11 +626,15 @@ case $host in
PYTHON_CPPFLAGS="-I${prefix}/include/python2.6"
PYTHON_SITE_PKG="${prefix}/lib/python2.6/site-packages"
PYTHON_NOVERSIONCHECK="no-check"
+ DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*})
+ AC_SUBST([DEPENDS_ROOT_FOR_XCODE])
;;
*86*-apple-darwin*)
use_joystick=no
use_vtbdecoder=no
ARCH="x86-osx"
+ DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*})
+ AC_SUBST([DEPENDS_ROOT_FOR_XCODE])
;;
powerpc-apple-darwin*)
use_joystick=no
@@ -638,6 +642,8 @@ case $host in
use_crystalhd=no
ARCH="powerpc-osx"
use_arch="ppc"
+ DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*})
+ AC_SUBST([DEPENDS_ROOT_FOR_XCODE])
;;
powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
ARCH="powerpc-linux"
@@ -2558,6 +2564,10 @@ OUTPUT_FILES="Makefile \
xbmc/android/jni/Makefile \
xbmc/utils/Makefile \
xbmc/main/Makefile \
+ tools/darwin/Configurations/App.xcconfig \
+ tools/darwin/Configurations/Common.xcconfig \
+ tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh \
+ tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh \
project/cmake/xbmc-config.cmake"
if test "$use_wayland" = "yes"; then
diff --git a/tools/buildsteps/atv2/package b/tools/buildsteps/atv2/package
index d357e36b0c..2fa40de122 100755
--- a/tools/buildsteps/atv2/package
+++ b/tools/buildsteps/atv2/package
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=atv2
#ensure that dpkg tools are used from our toolchain
export PATH=$XBMC_DEPENDS_ROOT/buildtools-native/bin/:$PATH
-cd $WORKSPACE/tools/darwin/packaging/xbmc-atv2/;./mkdeb-xbmc-atv2.sh $Configuration
+cd $WORKSPACE/tools/darwin/packaging/xbmc-atv2/;sh mkdeb-xbmc-atv2.sh $Configuration
#rename for upload
#e.x. xbmc-20130314-8c2fb31-Frodo-atv2.deb
diff --git a/tools/buildsteps/ios/package b/tools/buildsteps/ios/package
index 0b4830d139..f6c9c2299f 100755
--- a/tools/buildsteps/ios/package
+++ b/tools/buildsteps/ios/package
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=ios
#ensure that dpkg tools are used from our toolchain
export PATH=$XBMC_DEPENDS_ROOT/buildtools-native/bin/:$PATH
-cd $WORKSPACE/tools/darwin/packaging/xbmc-ios/;./mkdeb-xbmc-ios.sh $Configuration
+cd $WORKSPACE/tools/darwin/packaging/xbmc-ios/;sh mkdeb-xbmc-ios.sh $Configuration
#rename for upload
#e.x. xbmc-20130314-8c2fb31-Frodo-ios.deb
diff --git a/tools/darwin/Configurations/App.xcconfig b/tools/darwin/Configurations/App.xcconfig.in
index e55bd4f0c3..936815c921 100644
--- a/tools/darwin/Configurations/App.xcconfig
+++ b/tools/darwin/Configurations/App.xcconfig.in
@@ -18,7 +18,7 @@
//
//
-XBMC_DEPENDS_ROOT = /Users/Shared/xbmc-depends
+XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@
HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6
diff --git a/tools/darwin/Configurations/Common.xcconfig b/tools/darwin/Configurations/Common.xcconfig.in
index 353d7983a7..e8b0db190d 100644
--- a/tools/darwin/Configurations/Common.xcconfig
+++ b/tools/darwin/Configurations/Common.xcconfig.in
@@ -18,6 +18,8 @@
//
//
+XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@
+
XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON = TARGET_POSIX TARGET_DARWIN _LINUX _REENTRANT _FILE_DEFINED _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE __STDC_CONSTANT_MACROS HAVE_CONFIG_H HAS_SPC_CODEC NPT_CONFIG_ENABLE_LOGGING
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in
index 9a1e26232f..ec15372fd9 100755..100644
--- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
+++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in
@@ -1,9 +1,10 @@
#!/bin/sh
# usage: ./mkdeb-xbmc-atv2.sh release/debug (case insensitive)
# Allows us to run mkdeb-xbmc-atv2.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-atv2 folder only
+XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@
SWITCH=`echo $1 | tr [A-Z] [a-z]`
DIRNAME=`dirname $0`
-DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms
+DSYM_TARGET_DIR=${XBMC_DEPENDS_ROOT}/dSyms
DSYM_FILENAME=XBMC.frappliance.dSYM
if [ ${SWITCH:-""} = "debug" ]; then
@@ -36,9 +37,9 @@ if [ -f "/usr/libexec/fauxsu/libfauxsu.dylib" ]; then
elif [ -f "/usr/bin/sudo" ]; then
SUDO="/usr/bin/sudo"
fi
-if [ -f "/Users/Shared/xbmc-depends/buildtools-native/bin/dpkg-deb" ]; then
+if [ -f "$XBMC_DEPENDS_ROOT/buildtools-native/bin/dpkg-deb" ]; then
# make sure we pickup our tar, gnutar will fail when dpkg -i
- bin_path=$(cd /Users/Shared/xbmc-depends/buildtools-native/bin; pwd)
+ bin_path=$(cd ${XBMC_DEPENDS_ROOT}/buildtools-native/bin; pwd)
export PATH=${bin_path}:${PATH}
fi
diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in
index 432303a888..be99c0cb79 100755..100644
--- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
+++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in
@@ -2,9 +2,10 @@
# usage: ./mkdeb-xbmc-ios.sh release/debug (case insensitive)
# Allows us to run mkdeb-xbmc-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-ios folder only
+XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@
SWITCH=`echo $1 | tr [A-Z] [a-z]`
DIRNAME=`dirname $0`
-DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms
+DSYM_TARGET_DIR=${XBMC_DEPENDS_ROOT}/dSyms
DSYM_FILENAME=XBMC.app.dSYM
if [ ${SWITCH:-""} = "debug" ]; then
@@ -37,9 +38,9 @@ if [ -f "/usr/libexec/fauxsu/libfauxsu.dylib" ]; then
elif [ -f "/usr/bin/sudo" ]; then
SUDO="/usr/bin/sudo"
fi
-if [ -f "/Users/Shared/xbmc-depends/buildtools-native/bin/dpkg-deb" ]; then
+if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then
# make sure we pickup our tar, gnutar will fail when dpkg -i
- bin_path=$(cd /Users/Shared/xbmc-depends/buildtools-native/bin; pwd)
+ bin_path=$(cd ${XBMC_DEPENDS_ROOT}/buildtools-native/bin; pwd)
export PATH=${bin_path}:${PATH}
fi
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-22 17:40:55 +0000