diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/defaultenv | 8 | ||||
| -rw-r--r-- | tools/depends/xbmc-addons.include | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index f7baab87d6..6b9f29d583 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -11,25 +11,25 @@ TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} #$XBMC_PLATFORM_DIR matches the platform subdirs! case $XBMC_PLATFORM_DIR in atv2) - DEFAULT_SDK_VERSION=4.2 + DEFAULT_SDK_VERSION=8.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; ios) - DEFAULT_SDK_VERSION=4.2 + DEFAULT_SDK_VERSION=8.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; osx32) - DEFAULT_SDK_VERSION=10.8 + DEFAULT_SDK_VERSION=10.10 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; osx64) - DEFAULT_SDK_VERSION=10.8 + DEFAULT_SDK_VERSION=10.10 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include index 5f0822dfdf..abd9f2a21a 100644 --- a/tools/depends/xbmc-addons.include +++ b/tools/depends/xbmc-addons.include @@ -7,10 +7,16 @@ endif CMAKE_EXTRA = ifeq (darwin, $(findstring darwin, $(HOST))) - INSTALL_PREFIX = ../../../../../addons/ - CMAKE_EXTRA = -DPACKAGE_ZIP=1 -DDEPENDS_PATH=$(PREFIX) -else ifneq ($(PREFIX),) - INSTALL_PREFIX = $(PREFIX) + INSTALL_PREFIX = ../../../../../addons/ + CMAKE_EXTRA = -DPACKAGE_ZIP=1 +endif + +ifneq ($(PREFIX),) + ifneq (darwin, $(findstring darwin, $(HOST))) + INSTALL_PREFIX = $(PREFIX) + endif + + CMAKE_EXTRA += -DDEPENDS_PATH=$(PREFIX) -DAUTOCONF_FILES="$(CONFIG_SUB) $(CONFIG_GUESS)" endif all: .installed-$(PLATFORM) @@ -28,6 +34,7 @@ ifeq ($(PREFIX),) @echo "ERROR: please set PREFIX to the xbmc install path e.g. make PREFIX=/usr/local" @exit 1 endif + cd ../../../../project/cmake/addons/ && (git clean -xfd || rm -rf CMakeCache.txt CMakeFiles cmake_install.cmake build/*) mkdir -p $(PLATFORM); \ cd $(PLATFORM); \ $(CMAKE) -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) $(CMAKE_EXTRA) \ |