[Bf-blender-cvs] [b92f997] master: make.bat correct name for cycles target

Campbell Barton noreply at git.blender.org
Fri Jan 1 08:54:59 CET 2016


Commit: b92f997cadb91de9175ea31f9e36336d19d50030
Author: Campbell Barton
Date:   Fri Jan 1 18:47:30 2016 +1100
Branches: master
https://developer.blender.org/rBb92f997cadb91de9175ea31f9e36336d19d50030

make.bat correct name for cycles target

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

M	make.bat

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

diff --git a/make.bat b/make.bat
index b1b5a35..a95e47b 100644
--- a/make.bat
+++ b/make.bat
@@ -40,7 +40,7 @@ if NOT "%1" == "" (
 		set BUILD_DIR=%BUILD_DIR%_lite
 		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
 		    -C"%BLENDER_DIR%\build_files\cmake\config\blender_lite.cmake"
-	) else if "%1" == "cycles_standalone" (
+	) else if "%1" == "cycles" (
 		set BUILD_DIR=%BUILD_DIR%_cycles
 		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
 		    -C"%BLENDER_DIR%\build_files\cmake\config\cycles_standalone.cmake"
@@ -84,9 +84,9 @@ cmake ^
 	%BUILD_CMAKE_ARGS%
 
 if %ERRORLEVEL% NEQ 0 (
-	ECHO "CMake Failed"
-	GOTO :EOF
-	)
+	echo "Configuration Failed"
+	goto EOF
+)
 
 msbuild ^
 	%BUILD_DIR%\Blender.sln ^
@@ -96,9 +96,9 @@ msbuild ^
 	/verbosity:minimal
 
 if %ERRORLEVEL% NEQ 0 (
-	ECHO "Build Failed"
-	GOTO :EOF
-	)
+	echo "Build Failed"
+	goto EOF
+)
 
 msbuild ^
 	%BUILD_DIR%\INSTALL.vcxproj ^




More information about the Bf-blender-cvs mailing list