diff options
| author | wsnipex <wsnipex@a1.net> | 2015-02-22 10:50:06 +0100 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2015-03-01 21:02:33 +0100 |
| commit | efaf6f1c9ad13523cf0278c5cfaca1f76b83dc34 (patch) | |
| tree | aa90b0d500dd2e03271a73a9df995a165cd2756e | |
| parent | ceeed0505ce9efebb6c1ecf46c17cc8df3525f99 (diff) | |
[depends] fix standalone building of binary addons
| -rw-r--r-- | tools/depends/xbmc-addons.include | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include index adb440a19d..b010279cb2 100644 --- a/tools/depends/xbmc-addons.include +++ b/tools/depends/xbmc-addons.include @@ -3,6 +3,7 @@ TOOLCHAIN_FILE = $(ADDON_DEPS_DIR)/share/Toolchain_binaddons.cmake ifeq ($(CROSS_COMPILING),yes) DEPS = $(TOOLCHAIN_FILE) $(abs_top_srcdir)/target/config-binaddons.site $(abs_top_srcdir)/target/Toolchain_binaddons.cmake $(CONFIG_SUB) $(CONFIG_GUESS) + TOOLCHAIN = -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) ifeq ($(OS),linux) ifneq ($(TARGET_PLATFORM),raspberry-pi) DEPS += linux-system-libs @@ -42,17 +43,20 @@ distclean: rm -rf $(PLATFORM) .installed-$(PLATFORM) native .installed-$(PLATFORM): $(DEPS) + cd ../../../../project/cmake/addons/ && (git clean -xfd || rm -rf CMakeCache.txt CMakeFiles cmake_install.cmake build/*) + mkdir -p $(PLATFORM) ifeq ($(PREFIX),) @echo @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/*) +ifeq ($(CROSS_COMPILING),yes) mkdir -p $(PLATFORM)/build/depends/share; \ - cp -f $(abs_top_srcdir)/target/config-binaddons.site $(PLATFORM)/build/depends/share/config.site ;\ - cd $(PLATFORM); \ - $(NATIVEPREFIX)/bin/cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) $(CMAKE_EXTRA) \ - -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \ + cp -f $(abs_top_srcdir)/target/config-binaddons.site $(PLATFORM)/build/depends/share/config.site +endif + cd $(PLATFORM); \ + $(CMAKE) -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) $(CMAKE_EXTRA) \ + $(TOOLCHAIN) \ -DADDONS_TO_BUILD=$(ADDONS) ../../../../../project/cmake/addons/ -DBUILD_DIR=$(BUILDDIR)/$(PLATFORM)/build ;\ $(MAKE); touch $@ |