Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlazydodo <github@lazydodo.com>2016-10-01 20:21:42 +0300
committerlazydodo <github@lazydodo.com>2016-10-01 20:22:09 +0300
commit11e93c5f2bd58db3079cf62654eae47fd2546721 (patch)
treed19683fb52759fc439c3c79c371cb65670467840 /make.bat
parentad23ee761bb729f013ffc1f5e32f032bded9dcd6 (diff)
[msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected.
Diffstat (limited to 'make.bat')
-rw-r--r--make.bat9
1 files changed, 7 insertions, 2 deletions
diff --git a/make.bat b/make.bat
index fb3b4b859db..022075805e4 100644
--- a/make.bat
+++ b/make.bat
@@ -105,10 +105,8 @@ if "%BUILD_ARCH%"=="" (
)
) else if "%BUILD_ARCH%"=="x64" (
set WINDOWS_ARCH= Win64
- set MSBUILD_PLATFORM=x64
) else if "%BUILD_ARCH%"=="x86" (
set WINDOWS_ARCH=
- set MSBUILD_PLATFORM=win32
)
if "%BUILD_VS_VER%"=="" (
@@ -116,6 +114,13 @@ if "%BUILD_VS_VER%"=="" (
set BUILD_VS_YEAR=2013
)
+if "%BUILD_ARCH%"=="x64" (
+ set MSBUILD_PLATFORM=x64
+ ) else if "%BUILD_ARCH%"=="x86" (
+ set MSBUILD_PLATFORM=win32
+)
+
+
set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%