From 8b63959509775435c81053d75e561a75b88b9949 Mon Sep 17 00:00:00 2001
From: Stinkfist0 <stinkfist0@gmail.com>
Date: Mon, 9 Nov 2015 16:04:06 +0200
Subject: [PATCH] Use separate BuildDepsCache.txt for x86 and x64 builds.

---
 .gitignore         |  8 ++++----
 win/build-deps.cmd |  4 ++--
 win/readme.txt     | 14 +++++++-------
 win/run-cmake.bat  |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f58a70deae..96fb1b5394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Dependency and build folders created by the build scripts
-deps*/
-build*/
-install*/
-/win/BuildDepsCache.txt
+/deps*/
+/build*/
+/install*/
+/win/BuildDepsCache*.txt
diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index b60f92d990..d3c5f7e2e8 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -289,8 +289,8 @@ set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.msi
 :: NOTE/TODO 3.5.0 doesn't use MSI any longer, but exe: set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.exe
 IF "%IFCOS_INSTALL_PYTHON%"=="TRUE" (
     REM Store Python versions to BuildDepsCache.txt for run-cmake.bat
-    echo PY_VER_MAJOR_MINOR=%PY_VER_MAJOR_MINOR%>"%THISDIR%\BuildDepsCache.txt"
-    echo PYTHONPATH=%PYTHONPATH%>>"%THISDIR%\BuildDepsCache.txt"
+    echo PY_VER_MAJOR_MINOR=%PY_VER_MAJOR_MINOR%>"%THISDIR%\BuildDepsCache-%TARGET_ARCH%.txt"
+    echo PYTHONPATH=%PYTHONPATH%>>"%THISDIR%\BuildDepsCache-%TARGET_ARCH%.txt"
 
     cd "%DEPS_DIR%"
     call :DownloadFile https://www.python.org/ftp/python/%PYTHON_VERSION%/%PYTHON_INSTALLER% "%DEPS_DIR%" %PYTHON_INSTALLER%
diff --git a/win/readme.txt b/win/readme.txt
index 0b9b14c0a7..fcfab65262 100644
--- a/win/readme.txt
+++ b/win/readme.txt
@@ -40,11 +40,11 @@ folder and the required IfcOpenShell-Python parts are deployed to the <PYTHONPAT
 
 == Directory Structure ==
 
-|   build-deps.cmd          - Fetches and builds all needed dependencies for IFCOS
-|   readme.txt              - This file
-|   run-cmake.bat           - Sets environment variables for the dependencies and runs CMake for IFCOS
-|   vs-cfg.cmd              - Utility file used by the build scripts
-|   BuildDepsCache.txt      - Cache file created by build-deps.cmd
+|   build-deps.cmd            - Fetches and builds all needed dependencies for IFCOS
+|   readme.txt                - This file
+|   run-cmake.bat             - Sets environment variables for the dependencies and runs CMake for IFCOS
+|   vs-cfg.cmd                - Utility file used by the build scripts
+|   BuildDepsCache-<ARCH>.txt - Cache file created by build-deps.cmd
 |
-+---sln                     - Contains the old Visual Studio solution and project files
-\---utils                   - Contains various utilities for the build scripts
++---sln                       - Contains the old Visual Studio solution and project files
+\---utils                     - Contains various utilities for the build scripts
diff --git a/win/run-cmake.bat b/win/run-cmake.bat
index 0f8e14e1d6..8ee76982b2 100644
--- a/win/run-cmake.bat
+++ b/win/run-cmake.bat
@@ -25,11 +25,11 @@ set PROJECT_NAME=IfcOpenShell
 :: Enable the delayed environment variable expansion needed in vs-cfg.cmd.
 setlocal EnableDelayedExpansion
 
-:: Read Python related variables from BuildDepsCache.txt
-for /f "delims== tokens=1,2" %%G in (BuildDepsCache.txt) do set %%G=%%H
-
 call vs-cfg.cmd %1
 
+:: Read Python related variables from BuildDepsCache.txt
+for /f "delims== tokens=1,2" %%G in (BuildDepsCache-%TARGET_ARCH%.txt) do set %%G=%%H
+
 pushd ..
 set CMAKE_INSTALL_PREFIX=%CD%\installed-vs%VS_VER%-%TARGET_ARCH%
 popd