remove redundant includes from cmake and scons.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 30 May 2013 02:16:22 +0000 (02:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 30 May 2013 02:16:22 +0000 (02:16 +0000)
36 files changed:
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/pbvh.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/SConscript
source/blender/editors/animation/SConscript
source/blender/editors/armature/SConscript
source/blender/editors/curve/SConscript
source/blender/editors/curve/curve_ops.c
source/blender/editors/interface/SConscript
source/blender/editors/mesh/SConscript
source/blender/editors/metaball/SConscript
source/blender/editors/physics/SConscript
source/blender/editors/screen/SConscript
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_action/SConscript
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_api/SConscript
source/blender/editors/space_nla/SConscript
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/SConscript
source/blender/editors/transform/SConscript
source/blender/editors/util/SConscript
source/blender/editors/uvedit/SConscript
source/blender/nodes/SConscript
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/gameengine/Rasterizer/SConscript

index 0b6a3be7c84467a84a4da251dda6d97fa7e83542..72aae1b2361021dc0bd24a059687f6e28756301b 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* XXX, should have a more generic include for this */
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 struct BMesh;
index 4c811d55dbeba728cacbca85d0bb34a9f21b0b20..48c16f8db388bd604dc74947cab165016d00a0de 100644 (file)
@@ -30,9 +30,6 @@
 #include "BLI_ghash.h"
 #include "BLI_utildefines.h"
 
-/* Needed for BMesh functions used in the PBVH iterator macro */
-#include "bmesh.h"
-
 struct CCGElem;
 struct CCGKey;
 struct CustomData;
@@ -43,6 +40,8 @@ struct MFace;
 struct MVert;
 struct PBVH;
 struct PBVHNode;
+struct BMesh;
+struct BMLog;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
@@ -123,7 +122,7 @@ unsigned int **BKE_pbvh_grid_hidden(const PBVH *bvh);
 void BKE_pbvh_get_grid_key(const PBVH *pbvh, struct CCGKey *key);
 
 /* Only valid for type == PBVH_BMESH */
-BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
+struct BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
 void BKE_pbvh_bmesh_detail_size_set(PBVH *pbvh, float detail_size);
 
 typedef enum {
@@ -329,4 +328,3 @@ void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***nodes,  int *totnode);
 void pbvh_show_diffuse_color_set(PBVH *bvh, int show_diffuse_color);
 
 #endif /* __BKE_PBVH_H__ */
-
index ead8d1f1b25932766dd9f56f81c894f2eabacc27..710a9b787a092c0aaf47a95d6cc27821b9415250 100644 (file)
@@ -41,6 +41,8 @@
 
 #include "GPU_buffers.h"
 
+#include "bmesh.h"
+
 #include "pbvh_intern.h"
 
 #define LEAF_LIMIT 10000
index 7bf21b79899c1e3ac5025c1da47488123737cbd6..1d94ca9afbca3a7cbfc9b5deaaa6476efd662266 100644 (file)
@@ -29,7 +29,6 @@ set(INC
        .
        # ../blenkernel  # dont add this back!
        ../makesdna
-       ../makesrna
        ../../../intern/ghost
        ../../../intern/guardedalloc
        ../../../extern/wcwidth
index 7d5c8c339f47c69515780ffa005a218c0dc69fd0..104c58b1c9e9ffc90e736902ea986ffe80c2533b 100644 (file)
@@ -28,12 +28,12 @@ set(INC
        ../blenfont
        ../blenkernel
        ../blenlib
+       ../imbuf
        ../makesdna
        ../makesrna
        ../nodes
        ../render/extern/include
        ../../../intern/guardedalloc
-       ../imbuf
 )
 
 set(INC_SYS
index 30cbc79a40d7d35fe3d37a27619c4c02c11b6627..3882cc1029ae081e2ae6b8cdf0e4cf07b89d3598 100644 (file)
@@ -35,8 +35,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../bmesh',
-    '../editors/include',
     '../imbuf',
     '../makesdna',
     '../makesrna',
index 0f4fb71242bdae9d8e957aa0fd01877bd348487b..91d480978c49499e990c42054d0db3ecd72dfe3d 100644 (file)
@@ -36,8 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index 51345d94e60afdfb168179e96e63ece8aae98336..b3c1ea2dbe9f968cac444e9953dbe5982c71cc59 100644 (file)
@@ -37,12 +37,8 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
index de395a6cd4624eb0398dec9e9d7e1160a54783fc..4760a212a8a58daee4a58b2beeaee656f8257dae 100644 (file)
@@ -33,15 +33,10 @@ defs = []
 
 incs = [
     '#/intern/guardedalloc',
-    '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../render/extern/include',
index 406c26e901eae9fce903dba3eb2565db8fe00b3e..07dd2b82a06fd3fab3283b83804482d1cd8e0690 100644 (file)
@@ -269,4 +269,3 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
        ED_keymap_proportional_cycle(keyconf, keymap);
        ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
 }
-
index 0dc77ec5a3ecb0a650f30dbdc6ffe558975af8ec..1936e17a7bbb94cd3984f133b48417926a041cc9 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
     '../../gpu',
     '../../imbuf',
     '../../makesdna',
index e7ed3aae7d1456d7596bbdb78c2d8e7dcd4a1f07..6fa48c12ecaa515d3ee49c77547137b4aaa650de 100644 (file)
@@ -34,7 +34,6 @@ defs = []
 incs = [
     '#/intern/guardedalloc',
     '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../uvedit',
     '../../blenfont',
index fb82cb032c8893c45297532a00388d88d95a67ef..d31a10afe90e39ebfeb9eaf0b1d78d4c57bf0575 100644 (file)
@@ -31,13 +31,9 @@ sources = env.Glob('*.c')
 
 incs = [
     '#/intern/guardedalloc',
-    '#/extern/glew/include',
-    '#/intern/elbeem/extern',
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../render/extern/include',
index 0fda34a86b1b5745f2676fab3dcb9a760ea24b79..9436280de43c0145845431617e404ff9e19b8f03 100644 (file)
@@ -38,12 +38,8 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
-    '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
index affa28863c9579dc8cf142348462d39b2ec01396..28a6cbb02e6162482f18f280a8f4f2bb59374c5b 100644 (file)
@@ -41,7 +41,6 @@ incs = [
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
index 79b8cd5e695ddfafad96633c2d39f1e23bdc8b19..639f2e8d506d7c40b2d2aae078f1613b39be3215 100644 (file)
@@ -35,6 +35,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_brush_types.h"
+#include "DNA_customdata_types.h"
 #include "DNA_color_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 14eb358f20fe158e1b856457d1c2f7bae4d320bf..e0d578ec21073f7a505bb3c3e975cdd4a85c3b59 100644 (file)
@@ -64,6 +64,8 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
+#include "bmesh.h"
+
 #include "paint_intern.h"
 #include "sculpt_intern.h" /* for undo push */
 
index d42a7778a58ef0d297fffc590c39815f2420f286..8767b08035589172460584b6f2ecff2251308c30 100644 (file)
@@ -54,6 +54,8 @@
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 
+#include "bmesh.h"
+
 #include "paint_intern.h"
 #include "sculpt_intern.h" /* for undo push */
 
index badd49cb8fb01f83aea02cbe002cae72a0c7d879..df1978c49f65f776ef728e8cebd5fda17bc52c84 100644 (file)
@@ -30,6 +30,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
 
+#include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
index 053ace4e59d7e6bb824d18e597e4fa14fcd1f434..5647a8562c7307b941a2dec54148a8b524f57578 100644 (file)
@@ -44,6 +44,7 @@
 
 #include "BLF_translation.h"
 
+#include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
index 0421c4cc3ee366ae863a7af93ad38ce7c2c01e6a..2776bd2989a11aef833f5f587eb67a882eaf7955 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index 3932924a521d477264676636440c2843dcb087d1..bf3257389ce0a25bcd0ee660e1b22413c840c41d 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../io
        ../../blenkernel
        ../../blenlib
-       ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index bd0f490a56dad70939d4356f8a64abfa8e9d5e51..2ba918ffc8447d4739c5eb5cf6787e8e345aa451 100644 (file)
@@ -36,10 +36,8 @@ incs = [
     '../io',
     '../../blenkernel',
     '../../blenlib',
-    '../../bmesh',
     '../../makesdna',
     '../../makesrna',
-    '../../python',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
index a3063dae94642d5151bc882da525f36111af6ba6..a00337e0b5854cb5029640139a8ad8b7cf08038f 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index 7aa07f4e022bdcf982b85b3eb5d3a1324cfc4eec..26c4183f7df6cd5de9623b3bceadfa5b75aaf138 100644 (file)
@@ -44,9 +44,6 @@ if(WITH_PYTHON)
        list(APPEND INC
                ../../python
        )
-       list(APPEND INC_SYS
-               ${PYTHON_INCLUDE_DIRS}
-       )
        add_definitions(-DWITH_PYTHON)
 endif()
 
index d848ce33503991f278996665ed8a97e6ede5118b..0bb8ede7cca8962337346fb3e190653d2a16d167 100644 (file)
@@ -52,9 +52,6 @@ if(WITH_PYTHON)
        list(APPEND INC
                ../../python
        )
-       list(APPEND INC_SYS
-               ${PYTHON_INCLUDE_DIRS}
-       )
        add_definitions(-DWITH_PYTHON)
 endif()
 
index fb09fe2c11b93cfca65ed7ded742d360e8ac52d4..bf1b918f4f18ccda7bd397d8906dc51e905abc93 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index eeefcedd014c4ecb47ea2ce16552e069319dbb80..f3c8c13647a6d2b361bbc46ebfa5a36d676bb167 100644 (file)
@@ -37,12 +37,9 @@ incs = [
     '../../blenkernel',
     '../../blenlib',
     '../../bmesh',
-    '../../gpu',
     '../../ikplugin',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
-    '../../render/extern/include',
     '../../windowmanager',
     ]
 
index 120ffc69bc8f0b96aab246c70962364abf9f87ff..223ee5731f1700f3bd0f7748bbdcce977dba077d 100644 (file)
@@ -38,7 +38,6 @@ incs = [
     '../../blenkernel',
     '../../blenlib',
     '../../bmesh',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index 8b1cbd06f2c09a514086bdc02c4af3bbb23a8e14..413503191cdf654feec4b450ae733354386948f3 100644 (file)
@@ -41,7 +41,6 @@ incs = [
     '../../blenlib',
     '../../bmesh',
     '../../gpu',
-    '../../imbuf',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index edb9c09412195fee0a938255d18ea4cba3c8a9aa..683a1c475e4d89959b2691616271fdf4bef703db 100644 (file)
@@ -40,17 +40,14 @@ incs = [
     './texture',
     '#/intern/guardedalloc',
     '#/extern/glew/include',
-    '../avi',
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../editors/include',
     '../gpu',
     '../imbuf',
     '../makesdna',
     '../makesrna',
     '../render/extern/include',
-    '../renderconverter',
     env['BF_OPENGL_INC'],
     env['BF_ZLIB_INC'],
     ]
index a907384e19eba7730f157761b3850056f587b0d2..94a959740095fb10dbbf396e5129bca1ab258c2b 100644 (file)
@@ -129,10 +129,6 @@ if(WITH_PYTHON)
        list(APPEND INC
                ../python
        )
-
-       list(APPEND INC_SYS
-               ${PYTHON_INCLUDE_DIRS}
-       )
 endif()
 
 if(WITH_IMAGE_OPENEXR)
index ef5c5066426a1f8a0ef9f653004538175f9645d5..297e4fcecd4f6428952f2b67b101be4a5c42ac67 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../bmesh',
     '../imbuf',
     '../include',
     '../makesdna',
@@ -58,7 +57,6 @@ if env['WITH_BF_SMOKE']:
 
 if env['WITH_BF_PYTHON']:
     incs += ' ../python'
-    incs += ' ' + env['BF_PYTHON_INC']
     defs.append('WITH_PYTHON')
     if env['BF_DEBUG']:
         defs.append('DEBUG')
index 65a8945f82bd6996e07c2fae88090827268dbd4f..b9a5b5ffaae8230ea5e3e53bcea2900b5f83c51e 100644 (file)
@@ -31,7 +31,6 @@ set(INC
        ../blenloader
        ../compositor
        ../editors/include
-       ../editors/io
        ../gpu
        ../imbuf
        ../makesdna
@@ -39,11 +38,9 @@ set(INC
        ../nodes
        ../render/extern/include
        ../../gameengine/BlenderRoutines
-       ../../../intern/elbeem/extern
        ../../../intern/ghost
        ../../../intern/guardedalloc
        ../../../intern/memutil
-       ../../../intern/opennl/extern
 )
 
 set(INC_SYS
index 89da9abaa8fe33dc85755048fa45bceb3d21f47e..3a813d7d5985c3d9edb568c7787d639e745f00ac 100644 (file)
@@ -32,7 +32,6 @@ sources = env.Glob('intern/*.c')
 
 incs = [
     '.',
-    '#/intern/elbeem',
     '#/intern/ghost',
     '#/intern/guardedalloc',
     '#/intern/memutil',
@@ -42,7 +41,6 @@ incs = [
     '../blenkernel',
     '../blenlib',
     '../blenloader',
-    '../bmesh',
     '../compositor',
     '../editors/include',
     '../gpu',
@@ -51,7 +49,6 @@ incs = [
     '../makesrna',
     '../nodes',
     '../python',
-    '../radiosity/extern/include',
     '../render/extern/include',
     env['BF_ZLIB_INC'],
     ]
index 860b5992daa34141a94f54fe22b2d2a4e9ab682d..5c68ce63a3bbf827367c59ff9c916cd13644c7d8 100644 (file)
@@ -31,26 +31,23 @@ sources = env.Glob('*.cpp')
 
 incs = [
     '.',
-    '#/intern/guardedalloc',
-    '#/intern/string',
-    '#/intern/moto/include',
-    '#/intern/container',
-    '#/source/gameengine/BlenderRoutines',
-    '#/extern/glew/include',
-    '#/source/gameengine/Expressions',
-    '#/source/gameengine/SceneGraph',
-    '#/source/blender/blenlib',
-    '#/source/blender/blenkernel',
-    '#/source/blender/makesdna',
+    '#intern/guardedalloc',
+    '#intern/string',
+    '#intern/moto/include',
+    '#intern/container',
+    '#source/gameengine/BlenderRoutines',
+    '#extern/glew/include',
+    '#source/gameengine/Expressions',
+    '#source/gameengine/SceneGraph',
+    '#source/blender/blenlib',
+    '#source/blender/blenkernel',
+    '#source/blender/makesdna',
     ]
 
 defs = ['GLEW_STATIC']
 
 if env['WITH_BF_PYTHON']:
-    if type(env['BF_PYTHON_INC']) == str:
-      incs.append(env['BF_PYTHON_INC'].split(' '))
-    else:
-      incs.append(env['BF_PYTHON_INC'])
+    incs.extend(Split(env['BF_PYTHON_INC']))
     defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']: