[Bf-blender-cvs] [52a0071] opensubdiv-modifier: OpenSubdiv: Cleanup of include directories
Sergey Sharybin
noreply at git.blender.org
Tue Jul 14 18:54:32 CEST 2015
Commit: 52a00710340bfa94c6960c82fb31426da99804bd
Author: Sergey Sharybin
Date: Tue Jul 14 18:50:54 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB52a00710340bfa94c6960c82fb31426da99804bd
OpenSubdiv: Cleanup of include directories
===================================================================
M intern/opensubdiv/CMakeLists.txt
M intern/opensubdiv/opensubdiv_device_context_cuda.cc
M intern/opensubdiv/opensubdiv_device_context_opencl.cc
===================================================================
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index b6bfac6..3f88ba5 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -26,15 +26,11 @@
set(INC
.
../guardedalloc
- ../../source/blender/blenlib
- ../../source/blender/blenkernel
- ../../source/blender/makesdna
)
set(INC_SYS
${OPENSUBDIV_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
- /usr/local/cuda/include
)
set(SRC
diff --git a/intern/opensubdiv/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/opensubdiv_device_context_cuda.cc
index 63f3254..60ffc9a 100644
--- a/intern/opensubdiv/opensubdiv_device_context_cuda.cc
+++ b/intern/opensubdiv/opensubdiv_device_context_cuda.cc
@@ -24,6 +24,8 @@
* language governing permissions and limitations under the Apache License.
*/
+#ifdef OPENSUBDIV_HAS_CUDA
+
#include "opensubdiv_device_context_cuda.h"
#if defined(_WIN32)
@@ -227,3 +229,5 @@ bool CudaDeviceContext::Initialize()
_initialized = true;
return true;
}
+
+#endif /* OPENSUBDIV_HAS_CUDA */
diff --git a/intern/opensubdiv/opensubdiv_device_context_opencl.cc b/intern/opensubdiv/opensubdiv_device_context_opencl.cc
index 541a008..8534fb5 100644
--- a/intern/opensubdiv/opensubdiv_device_context_opencl.cc
+++ b/intern/opensubdiv/opensubdiv_device_context_opencl.cc
@@ -25,6 +25,8 @@
*
*/
+#ifdef OPENSUBDIV_HAS_OPENCL
+
#include "opensubdiv_device_context_opencl.h"
#if defined(_WIN32)
@@ -241,3 +243,5 @@ bool CLDeviceContext::Initialize()
}
return true;
}
+
+#endif /* OPENSUBDIV_HAS_OPENCL */
More information about the Bf-blender-cvs
mailing list