Commit: 9450792bf291c718b5cb81b248a001094e0b3f62
Author: Ray Molenkamp
Date: Mon May 28 19:56:17 2018 -0600
Branches: master
https://developer.blender.org/rB9450792bf291c718b5cb81b248a001094e0b3f62
make.bat : add support for building with ninja and clang together.
===================================================================
M build_files/windows/build_ninja.cmd
M build_files/windows/configure_msbuild.cmd
M build_files/windows/configure_ninja.cmd
M build_files/windows/parse_arguments.cmd
===================================================================
diff --git a/build_files/windows/build_ninja.cmd
b/build_files/windows/build_ninja.cmd
index f6b266e206d..4f1a5408c28 100644
--- a/build_files/windows/build_ninja.cmd
+++ b/build_files/windows/build_ninja.cmd
@@ -10,7 +10,7 @@ echo %TIME% >>buildtime.txt
cd %BLENDER_DIR%
if "%HAS_ERROR%" == "1" (
- echo Error during build, see %BUILD_DIR%\Build.log for details
+ echo Error during build
exit /b 1
)
:EOF
\ No newline at end of file
diff --git a/build_files/windows/configure_msbuild.cmd
b/build_files/windows/configure_msbuild.cmd
index 95a8882a9ab..f06f3e317ee 100644
--- a/build_files/windows/configure_msbuild.cmd
+++ b/build_files/windows/configure_msbuild.cmd
@@ -10,6 +10,10 @@ if "%BUILD_ARCH%"=="x64" (
)
)
+if "%WITH_CLANG%"=="1" (
+ set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -T"LLVM-vs2017"
+)
+
if NOT EXIST %BUILD_DIR%\nul (
mkdir %BUILD_DIR%
)
diff --git a/build_files/windows/configure_ninja.cmd
b/build_files/windows/configure_ninja.cmd
index 24911a10275..f882ca3dbf0 100644
--- a/build_files/windows/configure_ninja.cmd
+++ b/build_files/windows/configure_ninja.cmd
@@ -1,11 +1,34 @@
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS%
-DCMAKE_BUILD_TYPE=%BUILD_TYPE%
if "%WITH_CLANG%" == "1" (
- echo Building with ninja and clang not supported yet.
+set LLVM_DIR=
+ for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY
"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM" /ve 2^>nul`) DO set
LLVM_DIR=%%C
+ if DEFINED LLVM_DIR (
+ if NOT "%verbose%" == "" (
+ echo LLVM Detected at "%LLVM_DIR%"
+ )
+ goto DetectionComplete
+ )
+
+ REM Check 32 bits
+ for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY
"HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM" /ve 2^>nul`) DO set LLVM_DIR=%%C
+ if DEFINED LLVM_DIR (
+ if NOT "%verbose%" == "" (
+ echo LLVM Detected at "%LLVM_DIR%"
+ )
+ goto DetectionComplete
+ )
+ echo LLVM not found
exit /b 1
+
+:DetectionComplete
+ set CC=%LLVM_DIR%\bin\clang-cl
+ set CXX=%LLVM_DIR%\bin\clang-cl
+ rem build and tested against 2017 15.7
+ set CFLAGS=-m64 -fmsc-version=1914
+ set CXXFLAGS=-m64 -fmsc-version=1914
)
-:DetectionComplete
if NOT "%verbose%" == "" (
echo BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
)
diff --git a/build_files/windows/parse_arguments.cmd
b/build_files/windows/parse_arguments.cmd
index 1cb2e1f3e8c..016bc875c3b 100644
--- a/build_files/windows/parse_arguments.cmd
+++ b/build_files/windows/parse_arguments.cmd
@@ -37,7 +37,7 @@ if NOT "%1" == "" (
set TARGET=Bpy
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
-C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake"
) else if "%1" == "clang" (
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -T"LLVM-vs2017"
+ set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
set WITH_CLANG=1
) else if "%1" == "release" (
set TARGET=Release
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
