openvdb.diff 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  1. diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
  2. --- openvdb.orig/openvdb/CMakeLists.txt 2018-04-10 12:22:17 -0600
  3. +++ openvdb/openvdb/CMakeLists.txt 2018-08-15 19:04:52 -0600
  4. @@ -82,6 +82,9 @@
  5. IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
  6. ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
  7. ENDIF ()
  8. +if(WIN32)
  9. +ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE )
  10. +endif()
  11. FIND_PACKAGE ( Blosc REQUIRED )
  12. FIND_PACKAGE ( TBB REQUIRED )
  13. @@ -195,6 +198,7 @@
  14. ${Ilmbase_HALF_LIBRARY}
  15. ${ZLIB_LIBRARY}
  16. ${BLOSC_blosc_LIBRARY}
  17. + ${EXTRA_LIBS}
  18. )
  19. IF (WIN32)
  20. @@ -225,13 +228,16 @@
  21. ${VDB_PRINT_SOURCE_FILES}
  22. )
  23. +if(NOT WIN32)
  24. + set(EXTRA_LIBS m stdc++ dl)
  25. +endif()
  26. +
  27. TARGET_LINK_LIBRARIES ( vdb_print
  28. openvdb_shared
  29. ${CMAKE_THREAD_LIBS_INIT}
  30. ${BLOSC_blosc_LIBRARY}
  31. - m
  32. - stdc++
  33. - )
  34. + ${EXTRA_LIBS}
  35. +)
  36. SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc )
  37. SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
  38. @@ -249,8 +255,7 @@
  39. ${Openexr_ILMIMF_LIBRARY}
  40. ${Ilmbase_ILMTHREAD_LIBRARY}
  41. ${Ilmbase_IEX_LIBRARY}
  42. - m
  43. - stdc++
  44. + ${EXTRA_LIBS}
  45. )
  46. SET ( VDB_VIEW_SOURCE_FILES
  47. @@ -270,7 +270,7 @@
  48. PROPERTIES
  49. COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
  50. )
  51. -IF (NOT WIN32)
  52. +IF (FALSE)
  53. ADD_EXECUTABLE ( vdb_view
  54. ${VDB_VIEW_SOURCE_FILES}
  55. )
  56. @@ -283,9 +288,8 @@
  57. ${GLFW_LINK_LIBRARY}
  58. ${GLFW_DEPENDENT_LIBRARIES}
  59. ${GLEW_GLEW_LIBRARY}
  60. - m
  61. - stdc++
  62. - )
  63. + ${EXTRA_LIBS}
  64. + )
  65. ENDIF ()
  66. SET ( UNITTEST_SOURCE_FILES
  67. @@ -392,8 +396,7 @@
  68. TARGET_LINK_LIBRARIES ( vdb_test
  69. ${CPPUnit_cppunit_LIBRARY}
  70. openvdb_shared
  71. - m
  72. - stdc++
  73. + ${EXTRA_LIBS}
  74. )
  75. ADD_TEST ( vdb_unit_test vdb_test )
  76. @@ -422,7 +422,7 @@
  77. ENDIF ()
  78. # Installation
  79. -IF ( NOT WIN32 )
  80. +IF ( FALSE )
  81. INSTALL ( TARGETS
  82. vdb_view
  83. DESTINATION
  84. diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h
  85. --- openvdb.orig/openvdb/math/Coord.h 2018-04-10 12:22:17 -0600
  86. +++ openvdb/openvdb/math/Coord.h 2018-08-15 20:32:43 -0600
  87. @@ -35,6 +35,7 @@
  88. #include <array> // for std::array
  89. #include <iostream>
  90. #include <limits>
  91. +#define NOMINMAX
  92. #include <openvdb/Platform.h>
  93. #include "Math.h"
  94. #include "Vec3.h"