Blender Git Loki
Git Commits -> Revision d492790
Revision d492790 by Rafael Campos (soc-2013-cycles_volume) July 14, 2013, 12:58 (GMT) |
- added tbb lib to macros.cmake; - edited root CMakeLists.txt to add internal subdir for OPENVDB_INCLUDE_DIRS; - removed #define ZLIB_WINAPI from extern/openvdb/internal/openvdb/io/Compression.h, which was causing conflicts with OpenEXR's IlmImf.h (which I assume already defines this). - added preprocessor guard in openvdb/internal/openvdb/math/Coord.h, so #define NOMINMAX is specific to Windows; - added extern_openvdb lib to intern/cycles/CMakeLists.txt; - included openvdb.h in osl/osl_services.h, and called one of its methods to ensure it's working; - added extern_openvdb to creator/CMakeLists.txt; |
Commit Details:
Full Hash: d4927901f425f9c0618ce5fdb5f30d2b96b1ced0
SVN Revision: 58235
Parent Commit: 1eef67a
Lines Changed: +31, -7
10 Modified Paths:
/build_files/cmake/macros.cmake (+6, -1) (Diff)
/CMakeLists.txt (+1, -1) (Diff)
/extern/openvdb/CMakeLists.txt (+1, -1) (Diff)
/extern/openvdb/internal/openvdb/io/Compression.cc (+0, -2) (Diff)
/extern/openvdb/internal/openvdb/io/Compression.h (+0, -1) (Diff)
/extern/openvdb/internal/openvdb/math/Coord.h (+2, -0) (Diff)
/intern/cycles/CMakeLists.txt (+6, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+6, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+2, -0) (Diff)
/source/creator/CMakeLists.txt (+7, -0) (Diff)
/CMakeLists.txt (+1, -1) (Diff)
/extern/openvdb/CMakeLists.txt (+1, -1) (Diff)
/extern/openvdb/internal/openvdb/io/Compression.cc (+0, -2) (Diff)
/extern/openvdb/internal/openvdb/io/Compression.h (+0, -1) (Diff)
/extern/openvdb/internal/openvdb/math/Coord.h (+2, -0) (Diff)
/intern/cycles/CMakeLists.txt (+6, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+6, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+2, -0) (Diff)
/source/creator/CMakeLists.txt (+7, -0) (Diff)