123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103 |
- diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
- --- openvdb.orig/openvdb/CMakeLists.txt 2018-04-10 12:22:17 -0600
- +++ openvdb/openvdb/CMakeLists.txt 2018-08-15 19:04:52 -0600
- @@ -82,6 +82,9 @@
- IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
- ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
- +if(WIN32)
- +ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE )
- +endif()
-
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- @@ -195,6 +198,7 @@
- ${Ilmbase_HALF_LIBRARY}
- ${ZLIB_LIBRARY}
- ${BLOSC_blosc_LIBRARY}
- + ${EXTRA_LIBS}
- )
- IF (WIN32)
- @@ -225,13 +228,16 @@
- ${VDB_PRINT_SOURCE_FILES}
- )
-
- +if(NOT WIN32)
- + set(EXTRA_LIBS m stdc++ dl)
- +endif()
- +
- TARGET_LINK_LIBRARIES ( vdb_print
- openvdb_shared
- ${CMAKE_THREAD_LIBS_INIT}
- ${BLOSC_blosc_LIBRARY}
- - m
- - stdc++
- - )
- + ${EXTRA_LIBS}
- +)
-
- SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc )
- SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
- @@ -249,8 +255,7 @@
- ${Openexr_ILMIMF_LIBRARY}
- ${Ilmbase_ILMTHREAD_LIBRARY}
- ${Ilmbase_IEX_LIBRARY}
- - m
- - stdc++
- + ${EXTRA_LIBS}
- )
-
- SET ( VDB_VIEW_SOURCE_FILES
- @@ -270,7 +270,7 @@
- PROPERTIES
- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
- )
- -IF (NOT WIN32)
- +IF (FALSE)
- ADD_EXECUTABLE ( vdb_view
- ${VDB_VIEW_SOURCE_FILES}
- )
- @@ -283,9 +288,8 @@
- ${GLFW_LINK_LIBRARY}
- ${GLFW_DEPENDENT_LIBRARIES}
- ${GLEW_GLEW_LIBRARY}
- - m
- - stdc++
- - )
- + ${EXTRA_LIBS}
- + )
- ENDIF ()
-
- SET ( UNITTEST_SOURCE_FILES
- @@ -392,8 +396,7 @@
- TARGET_LINK_LIBRARIES ( vdb_test
- ${CPPUnit_cppunit_LIBRARY}
- openvdb_shared
- - m
- - stdc++
- + ${EXTRA_LIBS}
- )
-
- ADD_TEST ( vdb_unit_test vdb_test )
- @@ -422,7 +422,7 @@
- ENDIF ()
-
- # Installation
- -IF ( NOT WIN32 )
- +IF ( FALSE )
- INSTALL ( TARGETS
- vdb_view
- DESTINATION
- diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h
- --- openvdb.orig/openvdb/math/Coord.h 2018-04-10 12:22:17 -0600
- +++ openvdb/openvdb/math/Coord.h 2018-08-15 20:32:43 -0600
- @@ -35,6 +35,7 @@
- #include <array> // for std::array
- #include <iostream>
- #include <limits>
- +#define NOMINMAX
- #include <openvdb/Platform.h>
- #include "Math.h"
- #include "Vec3.h"
|