[Bf-blender-cvs] [11e93c5] master: [msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected.

lazydodo noreply at git.blender.org
Sat Oct 1 19:22:22 CEST 2016


Commit: 11e93c5f2bd58db3079cf62654eae47fd2546721
Author: lazydodo
Date:   Sat Oct 1 11:21:42 2016 -0600
Branches: master
https://developer.blender.org/rB11e93c5f2bd58db3079cf62654eae47fd2546721

[msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected.

===================================================================

M	make.bat

===================================================================

diff --git a/make.bat b/make.bat
index fb3b4b8..0220758 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%




More information about the Bf-blender-cvs mailing list