diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-10-27 22:44:22 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-11-05 11:54:52 +0100 |
| commit | a9d6fed143d395479fad6dd30c68c4a3f661626a (patch) | |
| tree | 2e93287ddcba4173007a746cc8346ba2a95c1b82 /tools | |
| parent | 3f627a55f2f0e59ecfe37399d4af4b455cf6b916 (diff) | |
[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.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/win32/make-addons.bat | 2 | ||||
| -rw-r--r-- | tools/windows/prepare-binary-addons-dev.bat | 2 |
2 files changed, 2 insertions, 2 deletions
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 ( |