From a9d6fed143d395479fad6dd30c68c4a3f661626a Mon Sep 17 00:00:00 2001 From: Christian Fetzer Date: Thu, 27 Oct 2016 22:44:22 +0200 Subject: [binary-addons] Rename DEPENDS_PATH into ADDON_DEPENDS_PATH DEPENDS_PATH is used twice in the code build system it's set to the system depends path (via toolchain file). In the addon system it's used to point to the place where addon dependencies should be built. This change renames the variable for binary-addons to ADDON_DEPENDS_PATH. The toolchain file can then be used for local addon builds. --- tools/buildsteps/win32/make-addons.bat | 2 +- tools/windows/prepare-binary-addons-dev.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat index efad84a9cf..04ef0de25b 100644 --- a/tools/buildsteps/win32/make-addons.bat +++ b/tools/buildsteps/win32/make-addons.bat @@ -110,7 +110,7 @@ cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^ -DCMAKE_INSTALL_PREFIX=%ADDONS_INSTALL_PATH% ^ -DCORE_SOURCE_DIR=%WORKDIR% ^ -DBUILD_DIR=%ADDONS_BUILD_PATH% ^ - -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ + -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ -DPACKAGE_ZIP=ON ^ -DADDONS_TO_BUILD="%ADDONS_TO_BUILD%" IF ERRORLEVEL 1 ( diff --git a/tools/windows/prepare-binary-addons-dev.bat b/tools/windows/prepare-binary-addons-dev.bat index 2e6f6f56d1..93561d430e 100644 --- a/tools/windows/prepare-binary-addons-dev.bat +++ b/tools/windows/prepare-binary-addons-dev.bat @@ -83,7 +83,7 @@ cmake "%ADDONS_PATH%" -G "Visual Studio 14" ^ -DCMAKE_INSTALL_PREFIX=%WORKDIR%\addons ^ -DCORE_SOURCE_DIR=%WORKDIR% ^ -DBUILD_DIR=%ADDONS_BUILD_PATH% ^ - -DDEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ + -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ -DPACKAGE_ZIP=ON ^ -DADDONS_TO_BUILD="%ADDONS_TO_BUILD%" IF ERRORLEVEL 1 ( -- cgit v1.2.3