[Bf-blender-cvs] [02b538e] master: Fix make.bat checking 64bit systems

Campbell Barton noreply at git.blender.org
Tue Feb 9 14:34:09 CET 2016


Commit: 02b538ec8306205769400d94069a9945d4a78508
Author: Campbell Barton
Date:   Wed Feb 10 00:26:12 2016 +1100
Branches: master
https://developer.blender.org/rB02b538ec8306205769400d94069a9945d4a78508

Fix make.bat checking 64bit systems

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

M	make.bat

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

diff --git a/make.bat b/make.bat
index 8c41308..b4cbe8c 100644
--- a/make.bat
+++ b/make.bat
@@ -116,10 +116,12 @@ if NOT "%1" == "" (
 	goto argv_loop
 )
 
-if "%PROCESSOR_ARCHITECTURE%" == "x86" (
-	set WINDOWS_ARCH=
-) else (
+if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
+	set WINDOWS_ARCH=Win64
+) else if "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
 	set WINDOWS_ARCH=Win64
+) else (
+	set WINDOWS_ARCH=
 )
 
 set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio 12 2013 %WINDOWS_ARCH%"




More information about the Bf-blender-cvs mailing list