forked from blender/blender
Ray molenkamp
81060ff6b2
This commit contains the minimum to make clang build/work with blender, asan and ninja build support is forthcoming Things to note: 1) Builds and runs, and is able to pass all tests (except for the freestyle_stroke_material.blend test which was broken at that time for all platforms by the looks of it) 2) It's slightly faster than msvc when using cycles. (time in seconds, on an i7-3370) victor_cpu msvc:3099.51 clang:2796.43 pavillon_barcelona_cpu msvc:1872.05 clang:1827.72 koro_cpu msvc:1097.58 clang:1006.51 fishy_cat_cpu msvc:815.37 clang:722.2 classroom_cpu msvc:1705.39 clang:1575.43 bmw27_cpu msvc:552.38 clang:561.53 barbershop_interior_cpu msvc:2134.93 clang:1922.33 3) clang on windows uses a drop in replacement for the Microsoft cl.exe (takes some of the Microsoft parameters, but not all, and takes some of the clang parameters but not all) and uses ms headers + libraries + linker, so you still need visual studio installed and will use our existing vc14 svn libs. 4) X64 only currently, X86 builds but crashes on startup. 5) Tested with llvm/clang 6.0.0 6) Requires visual studio integration, available at https://github.com/LazyDodo/llvm-vs2017-integration 7) The Microsoft compiler spawns a few copies of cl in parallel to get faster build times, clang doesn't, so the build time is 3-4x slower than with msvc. 8) No openmp support yet. Have not looked at this much, the binary distribution of clang doesn't seem to include it on windows. 9) No ASAN support yet, some of the sanitizers can be made to work, but it was decided to leave support out of this commit. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D3304
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_osl/src/cmake/flexbison.cmake
|
|
--- osl/src/external_osl//src/cmake/flexbison.cmake 2016-01-29 11:15:22 -0700
|
|
+++ osl_bak/src/external_osl/src/cmake/flexbison.cmake 2016-02-29 21:26:26 -0700
|
|
@@ -77,7 +77,7 @@
|
|
DEPENDS ${${compiler_headers}}
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
|
|
ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx}
|
|
- COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
|
|
+ COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
|
|
MAIN_DEPENDENCY ${flexsrc}
|
|
DEPENDS ${${compiler_headers}}
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
|
|
--- a/src/include/OSL/oslconfig.h 2016-10-31 16:48:19 -0600
|
|
+++ b/src/include/OSL/oslconfig.h 2018-05-27 11:18:08 -0600
|
|
@@ -44,12 +44,18 @@
|
|
// same if another packages is compiling against OSL and using these headers
|
|
// (OSL may be C++11 but the client package may be older, or vice versa --
|
|
// use these two symbols to differentiate these cases, when important).
|
|
-#if (__cplusplus >= 201402L)
|
|
-# define OSL_CPLUSPLUS_VERSION 14
|
|
-#elif (__cplusplus >= 201103L)
|
|
-# define OSL_CPLUSPLUS_VERSION 11
|
|
+
|
|
+// Force C++03 for MSVC in blender since svn the libraries are build with that
|
|
+#if !defined(_MSC_VER)
|
|
+ #if (__cplusplus >= 201402L)
|
|
+ # define OSL_CPLUSPLUS_VERSION 14
|
|
+ #elif (__cplusplus >= 201103L)
|
|
+ # define OSL_CPLUSPLUS_VERSION 11
|
|
+ #else
|
|
+ # define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */
|
|
+ #endif
|
|
#else
|
|
-# define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */
|
|
+ # define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */
|
|
#endif
|
|
|
|
// Symbol export defines
|