[Bf-blender-cvs] [9198ff43067] master: Cleanup/Win: Fix build folder name if no target is set

Lazydodo noreply at git.blender.org
Fri Aug 2 16:25:21 CEST 2019


Commit: 9198ff4306792ea5a1eb9c818a61cdd32ef3d7e2
Author: Lazydodo
Date:   Fri Aug 2 08:24:55 2019 -0600
Branches: master
https://developer.blender.org/rB9198ff4306792ea5a1eb9c818a61cdd32ef3d7e2

Cleanup/Win: Fix build folder name if no target is set

When you call make.bat without a target the build folder name would
have a double underscore in it which looked odd.

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

M	build_files/windows/set_build_dir.cmd

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

diff --git a/build_files/windows/set_build_dir.cmd b/build_files/windows/set_build_dir.cmd
index bb01749c5ee..65b5923cd9a 100644
--- a/build_files/windows/set_build_dir.cmd
+++ b/build_files/windows/set_build_dir.cmd
@@ -1,4 +1,9 @@
-set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+if NOT "%TARGET%" == "" (
+    set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+) else (
+    set BUILD_DIR=%BUILD_DIR%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+)
+
 if NOT "%BUILD_DIR_OVERRRIDE%"=="" (
 	set BUILD_DIR=%BUILD_DIR_OVERRRIDE%
 )
\ No newline at end of file



More information about the Bf-blender-cvs mailing list