forked from bartvdbraak/blender
make.bat : add support for building with ninja and clang together.
This commit is contained in:
parent
81060ff6b2
commit
9450792bf2
@ -10,7 +10,7 @@ echo %TIME% >>buildtime.txt
|
|||||||
cd %BLENDER_DIR%
|
cd %BLENDER_DIR%
|
||||||
|
|
||||||
if "%HAS_ERROR%" == "1" (
|
if "%HAS_ERROR%" == "1" (
|
||||||
echo Error during build, see %BUILD_DIR%\Build.log for details
|
echo Error during build
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
:EOF
|
:EOF
|
@ -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 (
|
if NOT EXIST %BUILD_DIR%\nul (
|
||||||
mkdir %BUILD_DIR%
|
mkdir %BUILD_DIR%
|
||||||
)
|
)
|
||||||
|
@ -1,11 +1,34 @@
|
|||||||
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
|
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
|
||||||
|
|
||||||
if "%WITH_CLANG%" == "1" (
|
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
|
exit /b 1
|
||||||
)
|
|
||||||
|
|
||||||
:DetectionComplete
|
: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
|
||||||
|
)
|
||||||
|
|
||||||
if NOT "%verbose%" == "" (
|
if NOT "%verbose%" == "" (
|
||||||
echo BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
|
echo BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
|
||||||
)
|
)
|
||||||
|
@ -37,7 +37,7 @@ if NOT "%1" == "" (
|
|||||||
set TARGET=Bpy
|
set TARGET=Bpy
|
||||||
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake"
|
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake"
|
||||||
) else if "%1" == "clang" (
|
) 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
|
set WITH_CLANG=1
|
||||||
) else if "%1" == "release" (
|
) else if "%1" == "release" (
|
||||||
set TARGET=Release
|
set TARGET=Release
|
||||||
|
Loading…
Reference in New Issue
Block a user