Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-17 08:13:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-17 08:13:03 +0400
commit536d9fec80dad342ef28f2fc8a0c5b4e5de98d31 (patch)
treebdb8fa7abc2bb0f3e5fb3a5ab19bd1f1d9b735a2 /intern/cycles
parentfa06aab433d61949506b2291f69d05caf7cf5d6a (diff)
code cleanup:
- move object_iterators.c --> view3d_iterators. (ED_object.h had to include ED_view3d.h which isn't so nice) - move projection functions from view3d_view.c --> view3d_project.c (view3d_view was becoming a mishmash of utility functions and operators). - some some cmake includes as system-includes.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/bvh/CMakeLists.txt1
-rw-r--r--intern/cycles/device/CMakeLists.txt1
-rw-r--r--intern/cycles/kernel/CMakeLists.txt2
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt2
-rw-r--r--intern/cycles/render/CMakeLists.txt1
-rw-r--r--intern/cycles/subd/CMakeLists.txt2
-rw-r--r--intern/cycles/util/CMakeLists.txt1
7 files changed, 10 insertions, 0 deletions
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index ba5c3785eac..cbbd23fcff8 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -7,6 +7,7 @@ set(INC
../util
../device
)
+
set(INC_SYS
)
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 1d7c6ef4be3..0071bbe5cdc 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -7,6 +7,7 @@ set(INC
../util
../render
)
+
set(INC_SYS
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index ad1ce1df295..92d10f31af5 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -5,7 +5,9 @@ set(INC
osl
svm
)
+
set(INC_SYS
+
)
set(SRC
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 65d7a7ad53b..f57dc1b666b 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -7,7 +7,9 @@ set(INC
../../util
../../device
)
+
set(INC_SYS
+
)
set(SRC
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index e75a3b37f3b..7907061c19c 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -8,6 +8,7 @@ set(INC
../bvh
../util
)
+
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index c0986e9c173..838776d60bf 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -6,7 +6,9 @@ set(INC
../kernel/svm
../render
)
+
set(INC_SYS
+
)
set(SRC
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index c677f2b13f4..bf5f791a245 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -2,6 +2,7 @@
set(INC
.
)
+
set(INC_SYS
${GLEW_INCLUDE_PATH}
${OPENGL_INCLUDE_DIR}