summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-24 13:50:49 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-24 13:50:49 +0100
commit050e0a9b9989d7caa4ff0089f4e4daf9f827eb22 (patch)
treeea5a85b705bd1ec48782f1e49ade1cd3417a20c7
parentbc677b1194651cf674f152495f1f204de5ba6375 (diff)
Rename Windows build environment file
-rw-r--r--appveyor.yml2
-rw-r--r--cmake/windows_build_environment_name (renamed from build/windows/golden_environment)0
-rw-r--r--tools/windows_buildenv.bat2
3 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml
index afc0c4d07e..acc815cfcb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -179,7 +179,7 @@ for:
secure: EiAsLAgrsS+N3rr71AAkXPCrxIe2vLvlOvCipnTw6pg=
install:
- - set /P ENVIRONMENT_NAME=<build/windows/golden_environment
+ - set /P ENVIRONMENT_NAME=<cmake\windows_build_environment_name
- set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
- set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
- set WINLIB_PATH=%ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%
diff --git a/build/windows/golden_environment b/cmake/windows_build_environment_name
index 4b78354121..4b78354121 100644
--- a/build/windows/golden_environment
+++ b/cmake/windows_build_environment_name
diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat
index a709099a9d..b168187a8e 100644
--- a/tools/windows_buildenv.bat
+++ b/tools/windows_buildenv.bat
@@ -97,7 +97,7 @@ EXIT /B 0
:READ_ENVNAME
- SET /P BUILDENV_NAME=<%MIXXX_ROOT%\build\windows\golden_environment
+ SET /P BUILDENV_NAME=<%MIXXX_ROOT%\cmake\windows_build_environment_name
SET BUILDENV_NAME=!BUILDENV_NAME:PLATFORM=%PLATFORM%!
SET BUILDENV_NAME=!BUILDENV_NAME:CONFIGURATION=%CONFIGURATION%!
SET RETVAL=%BUILDENV_NAME%