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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-04-16 16:34:32 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-16 16:41:32 +0300
commitfc32f98bbc2f094cddf1c75e092c98d7a00a22b9 (patch)
treeb92eb2a902580acadad583957064ae08452e9296 /make.bat
parentf45b91a1c5791c6f80f4790896e70b0fa9804da1 (diff)
Initial support of `make format` for Windows
There are couple of caviats currently: - The script requires system-wide Python 3 available in the current search PATH as python.exe. This will get addressed soon by distributing unpacked Python binary in our libraries. - Since the libraries folder is to be known, this requires to have MSVC detected. Not too bad, since formatting is still way slower than detection, but still doesn't feel ideal.
Diffstat (limited to 'make.bat')
-rw-r--r--make.bat11
1 files changed, 8 insertions, 3 deletions
diff --git a/make.bat b/make.bat
index 5fb428fbed0..4245071870c 100644
--- a/make.bat
+++ b/make.bat
@@ -47,13 +47,18 @@ if "%BUILD_VS_YEAR%" == "" (
)
)
+call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
+if errorlevel 1 goto EOF
+
+if "%FORMAT%" == "1" (
+ call "%BLENDER_DIR%\build_files\windows\format.cmd"
+ goto EOF
+)
+
call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd"
echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR%
-call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
-if errorlevel 1 goto EOF
-
call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
if errorlevel 1 goto EOF