[Bf-blender-cvs] [6ddd07d] opensubdiv-modifier: OpenSubdiv: Fixes to make branch compilable on Windows
Sergey Sharybin
noreply at git.blender.org
Thu Jul 16 21:19:29 CEST 2015
Commit: 6ddd07da2c8d2b64d34998c52bb623b0bcf6d227
Author: Sergey Sharybin
Date: Thu Jul 16 21:18:36 2015 +0500
Branches: opensubdiv-modifier
https://developer.blender.org/rB6ddd07da2c8d2b64d34998c52bb623b0bcf6d227
OpenSubdiv: Fixes to make branch compilable on Windows
Only teested CMake for now, checking SCons will happen later.
===================================================================
M CMakeLists.txt
M build_files/scons/config/darwin-config.py
M build_files/scons/config/linux-config.py
M build_files/scons/config/win32-mingw-config.py
M build_files/scons/config/win32-vc-config.py
M build_files/scons/config/win64-mingw-config.py
M build_files/scons/config/win64-vc-config.py
M intern/opensubdiv/opensubdiv_converter.cc
M intern/opensubdiv/opensubdiv_device_context_cuda.cc
M intern/opensubdiv/opensubdiv_device_context_opencl.cc
M intern/opensubdiv/opensubdiv_evaluator_capi.cc
M intern/opensubdiv/opensubdiv_utils_capi.cc
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8ed30d..39a94c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1511,8 +1511,8 @@ elseif(WIN32)
if(WITH_OPENSUBDIV)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
- set(OPENSUBDIV_LIBRARIES "osdutil osdCPU osdGPU")
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
+ set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib ${OPENSUBDIV_LIBPATH}/osdGPU.lib)
find_package(OpenSubdiv)
endif()
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index a435198..a831ab1 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -216,7 +216,7 @@ WITH_BF_OPENMP = True
WITH_BF_OPENSUBDIV = True
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdutil osdCPU osdGPU'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
#Ray trace optimization
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index bab9aef..3556c52 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -230,8 +230,8 @@ WITH_BF_OPENSUBDIV = False
WITH_BF_STATICOPENSUBDIV = False
BF_OPENSUBDIV = '/usr'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdutil osdGPU osdCPU'
-BF_OPENSUBDIV_LIB_STATIC = '${BF_OPENSUBDIV_LIBPATH}/libosdutil.a ${BF_OPENSUBDIV_LIBPATH}/libosdGPU.a ${BF_OPENSUBDIV_LIBPATH}/libosdCPU.a'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
+BF_OPENSUBDIV_LIB_STATIC = '${BF_OPENSUBDIV_LIBPATH}/libosdGPU.a ${BF_OPENSUBDIV_LIBPATH}/libosdCPU.a'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
##
diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py
index a0dd70d..3a4dfce 100644
--- a/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@ -169,7 +169,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
WITH_BF_OPENSUBDIV = False
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdCPU'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
#Ray trace optimization
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 4fbbec9..b639621 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -211,7 +211,7 @@ WITH_BF_FREESTYLE = True
WITH_BF_OPENSUBDIV = False
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdutil osdGPU osdCPU'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
WITH_BF_STATICOPENGL = False
diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index fd73c7c..16d8591 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -168,7 +168,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
WITH_BF_OPENSUBDIV = False
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdCPU'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
#Ray trace optimization
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index a2749f1..be39895 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -215,7 +215,7 @@ WITH_BF_FREESTYLE = True
WITH_BF_OPENSUBDIV = True if VC_VERSION == '12.0' else False
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdutil osdCPU osdGPU'
+BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
WITH_BF_STATICOPENGL = False
diff --git a/intern/opensubdiv/opensubdiv_converter.cc b/intern/opensubdiv/opensubdiv_converter.cc
index 729aa61..401e7b3 100644
--- a/intern/opensubdiv/opensubdiv_converter.cc
+++ b/intern/opensubdiv/opensubdiv_converter.cc
@@ -26,6 +26,10 @@
#include <cstdio>
#include <vector>
+#ifdef _MSC_VER
+# include "iso646.h"
+#endif
+
#include <opensubdiv/far/topologyRefinerFactory.h>
#include "opensubdiv_converter_capi.h"
diff --git a/intern/opensubdiv/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/opensubdiv_device_context_cuda.cc
index 60ffc9a..81c52f5 100644
--- a/intern/opensubdiv/opensubdiv_device_context_cuda.cc
+++ b/intern/opensubdiv/opensubdiv_device_context_cuda.cc
@@ -26,6 +26,10 @@
#ifdef OPENSUBDIV_HAS_CUDA
+#ifdef _MSC_VER
+# include "iso646.h"
+#endif
+
#include "opensubdiv_device_context_cuda.h"
#if defined(_WIN32)
diff --git a/intern/opensubdiv/opensubdiv_device_context_opencl.cc b/intern/opensubdiv/opensubdiv_device_context_opencl.cc
index 8534fb5..4cacdc9 100644
--- a/intern/opensubdiv/opensubdiv_device_context_opencl.cc
+++ b/intern/opensubdiv/opensubdiv_device_context_opencl.cc
@@ -27,6 +27,10 @@
#ifdef OPENSUBDIV_HAS_OPENCL
+#ifdef _MSC_VER
+# include "iso646.h"
+#endif
+
#include "opensubdiv_device_context_opencl.h"
#if defined(_WIN32)
diff --git a/intern/opensubdiv/opensubdiv_evaluator_capi.cc b/intern/opensubdiv/opensubdiv_evaluator_capi.cc
index 7efdebf..b8527fd 100644
--- a/intern/opensubdiv/opensubdiv_evaluator_capi.cc
+++ b/intern/opensubdiv/opensubdiv_evaluator_capi.cc
@@ -28,6 +28,10 @@
#include <cstdio>
#include <vector>
+#ifdef _MSC_VER
+# include "iso646.h"
+#endif
+
#include <opensubdiv/far/patchMap.h>
#include <opensubdiv/far/patchTable.h>
#include <opensubdiv/far/patchTableFactory.h>
diff --git a/intern/opensubdiv/opensubdiv_utils_capi.cc b/intern/opensubdiv/opensubdiv_utils_capi.cc
index a0a4e82..5a2d017 100644
--- a/intern/opensubdiv/opensubdiv_utils_capi.cc
+++ b/intern/opensubdiv/opensubdiv_utils_capi.cc
@@ -28,6 +28,10 @@
#include <GL/glew.h>
+#ifdef _MSC_VER
+# include "iso646.h"
+#endif
+
#ifdef OPENSUBDIV_HAS_OPENCL
# include "opensubdiv_device_context_opencl.h"
#endif /* OPENSUBDIV_HAS_OPENCL */
More information about the Bf-blender-cvs
mailing list