* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message
This commit is contained in:
Brecht Van Lommel
2011-08-16 16:15:34 +00:00
parent 18387f3e3f
commit 360fcd73fe
31 changed files with 808 additions and 504 deletions

View File

@@ -1,5 +1,5 @@
INCLUDE_DIRECTORIES(
include_directories(
.
../device
../kernel
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(
../util
${GLEW_INCLUDE_PATH})
SET(sources
set(sources
attribute.cpp
background.cpp
buffers.cpp
@@ -33,7 +33,7 @@ SET(sources
svm.cpp
tile.cpp)
SET(headers
set(headers
attribute.h
background.h
buffers.h
@@ -56,7 +56,7 @@ SET(headers
svm.h
tile.h)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
ADD_LIBRARY(cycles_render ${sources} ${headers})
add_library(cycles_render ${sources} ${headers})