cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jul 2011 09:11:13 +0000 (09:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jul 2011 09:11:13 +0000 (09:11 +0000)
73 files changed:
extern/binreloc/CMakeLists.txt
extern/glew/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/boolop/CMakeLists.txt
intern/bsp/CMakeLists.txt
intern/ghost/CMakeLists.txt
source/blender/avi/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/collada/CMakeLists.txt
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/ikplugin/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/python/generic/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt

index a4f85a2..753e280 100644 (file)
@@ -19,7 +19,7 @@
 #
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS
index a7ebe36..87f8bb6 100644 (file)
@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS
index 73ad009..7eef13b 100644 (file)
@@ -22,9 +22,9 @@
 
 set(INC
        .
-       intern
        FX
        SRC
+       intern
        ../ffmpeg
 )
 
index 7a95d55..742c0f1 100644 (file)
 
 set(INC        
        .
-       ./intern
-       ./extern
-       ../memutil
+       extern
+       intern
        ../container
        ../guardedalloc
+       ../memutil
        ../moto/include
        ../../source/blender/blenlib
        ../../source/blender/makesdna
index 792f6aa..a844db3 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./intern
+       intern
        ../container
        ../guardedalloc
-       ../moto/include
        ../memutil
+       ../moto/include
 )
 
 set(INC_SYS
index f49d075..ccd763e 100644 (file)
@@ -37,9 +37,8 @@ set(INC_SYS
 
 set(SRC
        intern/GHOST_Buttons.cpp
-       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_C-api.cpp
-       intern/GHOST_Path-api.cpp
+       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_DisplayManager.cpp
        intern/GHOST_EventManager.cpp
        intern/GHOST_ISystem.cpp
@@ -47,6 +46,7 @@ set(SRC
        intern/GHOST_ModifierKeys.cpp
        intern/GHOST_NDOFManager.cpp
        intern/GHOST_Path-api.cpp
+       intern/GHOST_Path-api.cpp
        intern/GHOST_Rect.cpp
        intern/GHOST_System.cpp
        intern/GHOST_TimerManager.cpp
@@ -63,6 +63,7 @@ set(SRC
        GHOST_Path-api.h
        GHOST_Rect.h
        GHOST_Types.h
+
        intern/GHOST_Buttons.h
        intern/GHOST_CallbackEventConsumer.h
        intern/GHOST_Debug.h
index bae61fd..0fd6435 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../../../intern/guardedalloc
        ../blenlib
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS
index 0258a41..82099d4 100644 (file)
 
 set(INC
        .
+       ../blenkernel
        ../blenlib
-       ../makesdna
        ../editors/include
-       ../blenkernel
+       ../makesdna
        ../../../intern/guardedalloc
 )
 
index a3c3357..9a384c4 100644 (file)
@@ -55,7 +55,7 @@ set(INC
        ../../../intern/smoke/extern
 
        # XXX - BAD LEVEL CALL WM_api.h
-       ../../../source/blender/windowmanager
+       ../windowmanager
 )
 
 set(INC_SYS
index de7695b..b4fc983 100644 (file)
 
 set(INC 
        .
-       ../makesdna
        ../blenkernel
        ../blenloader
        ../gpu
+       ../makesdna
        ../../../intern/ghost
        ../../../intern/guardedalloc
 )
index 312a654..be15b19 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../makesdna
        ../makesrna
        ../render/extern/include
index 193e401..9d39829 100644 (file)
@@ -28,9 +28,9 @@ set(INC
        .
        ..
        ../blenlib
+       ../blenloader
        ../imbuf
        ../makesdna
-       ../blenloader
        ../../../intern/guardedalloc
 )
 
index 07da532..e2a68d1 100644 (file)
@@ -28,13 +28,13 @@ remove_strict_flags()
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
-       ../windowmanager
+       ../editors/include
        ../makesdna
        ../makesrna
-       ../editors/include
+       ../windowmanager
        ../../../intern/guardedalloc
 )
 
index a3c1d03..83fe91d 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 2db6e27..9a44525 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index dfc7e33..9bad02e 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 352960d..7a2f196 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 6dd7af7..cc4c1ea 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
index bd8789b..02a25a2 100644 (file)
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 690a8ec..76561b1 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../render/extern/include
index 4d50b78..14b40d5 100644 (file)
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../ikplugin
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../python
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 1badccf..f32b23c 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 5434125..4282110 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 6ecbc9c..94e08a0 100644 (file)
 set(INC
        ../include
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
-       ../../imbuf
        ../../gpu
-       ../../blenlib
+       ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 55af283..f662888 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 6789556..edebaa8 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index c2dc258..4cbb290 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 0a4f251..631e2ad 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index afa746e..4aa6cdb 100644 (file)
@@ -28,8 +28,8 @@ set(INC
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index b7cde90..80205ad 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 7c2d7ff..0d4408f 100644 (file)
@@ -23,13 +23,13 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index c6ed1b7..22347df 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index cd24cb5..4447190 100644 (file)
 
 set(INC
        ../include
+       ../interface
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
-       ../../editors/interface
        ../../../../intern/guardedalloc
 )
 
index 1bf04f4..b05d157 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 9172bc4..dcd6bcd 100644 (file)
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../nodes
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
 )
index c05350c..4194d46 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 1884852..9d3bd4a 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 71a4cfc..9ce5f8e 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 367d07c..8700659 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 145da6c..acf00d2 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 79081c7..758d1e6 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 656a5d2..43ac90d 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index e83e51a..c6e9366 100644 (file)
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
 )
@@ -62,7 +62,7 @@ set(SRC
 
 if(WITH_GAMEENGINE)
        list(APPEND INC
-               ../../../../source/gameengine/BlenderRoutines
+               ../../../gameengine/BlenderRoutines
        )
        add_definitions(-DWITH_GAMEENGINE)
 endif()
index 8eb8d53..283b09f 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 8e54159..72f13c1 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 11e1703..552e1b6 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 76e3472..8f575df 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../imbuf
        ../makesdna
index da5c2f6..dc637ae 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
+       .
+       ../blenkernel
        ../blenlib
        ../makesdna
-       ../blenkernel
-       ../ikplugin
        ../../../intern/guardedalloc
        ../../../intern/iksolver/extern
 )
index 1517432..18b5eff 100644 (file)
@@ -32,12 +32,12 @@ endif()
 set(INC 
        .
        ../avi
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../makesdna
-       ../../../intern/memutil
        ../../../intern/guardedalloc
+       ../../../intern/memutil
 )
 
 set(INC_SYS
index 079f34a..4f7f20b 100644 (file)
@@ -29,8 +29,8 @@ set(INC
        ..
        ../..
        ../../../blenkernel
-       ../../../blenloader
        ../../../blenlib
+       ../../../blenloader
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
index db3c85d..53822b8 100644 (file)
@@ -28,8 +28,8 @@ set(INC
        .
        ..
        ../..
-       ../../../blenlib
        ../../../blenkernel
+       ../../../blenlib
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
index ca638b8..3be5219 100644 (file)
@@ -30,8 +30,8 @@ set(INC
        ../..
        ../../../blenkernel
        ../../../blenlib
-       ../../../../../intern/guardedalloc
        ../../../makesdna
+       ../../../../../intern/guardedalloc
 )
 
 set(INC_SYS
index ba5a7ac..d1f1532 100644 (file)
 
 set(INC 
        .
-       ./intern
+       intern
+       ../blenkernel
+       ../blenkernel/intern
        ../blenlib
        ../blenloader
        ../makesdna
-       ../blenkernel
-       ../blenkernel/intern
        ../render/extern/include
-       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS
index 794b31b..8dfbf47 100644 (file)
 
 set(INC 
        .
-       ../../blenlib
-       ../../makesdna
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
+       ../../makesdna
        ../../../../intern/guardedalloc
 )
 
index a1eb958..93a4b3e 100644 (file)
 
 set(INC 
        ..
+       ../../blenkernel
        ../../blenlib
+       ../../blenloader
+       ../../editors/include
        ../../makesdna
        ../../makesrna
-       ../../blenkernel
-       ../../blenloader
        ../../windowmanager
-       ../../editors/include
        ../../../../intern/guardedalloc
 )
 
index 6e72f05..b647466 100644 (file)
@@ -34,7 +34,6 @@ set(INC
        ../imbuf/intern
        ../makesdna
        ../makesrna
-       ../quicktime
        ../render/extern/include
        ../windowmanager
        ../../../intern/guardedalloc
index 9adebff..90aef81 100644 (file)
 
 
 set(INC 
-       intern/include
        extern/include
+       intern/include
+       ../blenkernel
        ../blenlib
        ../blenloader
+       ../imbuf
        ../makesdna
        ../makesrna
-       ../blenkernel
-       ../imbuf
-       ../../../intern/smoke/extern
-       ../../../intern/mikktspace
        ../../../intern/guardedalloc
+       ../../../intern/mikktspace
+       ../../../intern/smoke/extern
 )
 
 set(INC_SYS
index c815b4a..20ac3ba 100644 (file)
 
 set(INC
        .
-       ../nodes
-       ../gpu
        ../blenfont
-       ../blenlib
-       ../makesdna
-       ../makesrna
        ../blenkernel
-       ../imbuf
+       ../blenlib
        ../blenloader
        ../editors/include
+       ../gpu
+       ../imbuf
+       ../makesdna
+       ../makesrna
+       ../nodes
        ../render/extern/include
-       ../../../intern/guardedalloc
-       ../../../intern/memutil
+       ../../gameengine/BlenderRoutines
        ../../../intern/elbeem/extern
        ../../../intern/ghost
+       ../../../intern/guardedalloc
+       ../../../intern/memutil
        ../../../intern/opennl/extern
-       ../../../source/gameengine/BlenderRoutines
 )
 
 set(INC_SYS
index 80f3642..f852d06 100644 (file)
@@ -29,12 +29,12 @@ remove_strict_flags()
 
 set(INC 
        .
-       .. 
+       ..
+       ../../blender/blenkernel
+       ../../blender/blenloader
+       ../../blender/makesdna
+       ../../blender/makesrna
        ../../../intern/guardedalloc
-       ../../../source/blender/makesdna
-       ../../../source/blender/blenloader
-       ../../../source/blender/makesrna
-       ../../../source/blender/blenkernel
 )
 
 set(INC_SYS
index 28f567c..5a73047 100644 (file)
@@ -1,33 +1,33 @@
 
 set(INC
        .
-       ../../../intern/string
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
        ../../../intern/guardedalloc
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/blender/imbuf
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel 
-       ../../../source/blender/blenfont
-       ../../../source/blender/editors/include
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../extern/bullet2/src
+       ../../../intern/string
        ${GLEW_INCLUDE_PATH}
 )
 
index c905b86..45a7701 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Ketsji/KXNetwork
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/Dummy
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/ikplugin
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Physics/Dummy
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../source/blender/ikplugin
-       ../../../extern/bullet2/src
+       ../../../intern/string
 )
 
 set(INC_SYS
index 83d44e1..ad98709 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
+       ../SceneGraph
+       ../../blender/blenloader
        ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/SceneGraph
-       ../../../source/blender/blenloader
+       ../../../intern/string
 )
 
 set(INC_SYS
index 6e5d8b9..bd41716 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       . 
-       ../../../intern/string
+       .
+       ../Expressions
+       ../Rasterizer
+       ../SceneGraph
        ../../../intern/container
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/SceneGraph
        ../../../intern/moto/include
-       ../../../source/gameengine/Rasterizer
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -39,8 +39,6 @@ set(INC_SYS
 )
 
 set(SRC
-       Joystick/SCA_Joystick.cpp
-       Joystick/SCA_JoystickEvents.cpp
        SCA_2DFilterActuator.cpp
        SCA_ANDController.cpp
        SCA_ActuatorEventManager.cpp
@@ -81,10 +79,9 @@ set(SRC
        SCA_TimeEventManager.cpp
        SCA_XNORController.cpp
        SCA_XORController.cpp
+       Joystick/SCA_Joystick.cpp
+       Joystick/SCA_JoystickEvents.cpp
 
-       Joystick/SCA_Joystick.h
-       Joystick/SCA_JoystickDefines.h
-       Joystick/SCA_JoystickPrivate.h
        SCA_2DFilterActuator.h
        SCA_ANDController.h
        SCA_ActuatorEventManager.h
@@ -125,6 +122,9 @@ set(SRC
        SCA_TimeEventManager.h
        SCA_XNORController.h
        SCA_XORController.h
+       Joystick/SCA_Joystick.h
+       Joystick/SCA_JoystickDefines.h
+       Joystick/SCA_JoystickPrivate.h
 )
 
 if(WITH_SDL)
index d16ec6a..8c5897f 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ../ghost
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/Converter
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/ghost
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -61,7 +61,6 @@ set(INC_SYS
 )
 
 set(SRC 
-       bmfont.cpp
        GPC_Canvas.cpp
        GPC_Engine.cpp
        GPC_KeyboardDevice.cpp
@@ -71,6 +70,7 @@ set(SRC
        GPC_RawLogoArrays.cpp
        GPC_RenderTools.cpp
        GPC_System.cpp
+       bmfont.cpp
 
        GPC_Canvas.h
        GPC_Engine.h
index 5ac1210..944ec9a 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ../common
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../blender/makesrna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/gameengine/Converter
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/makesrna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/common
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -62,9 +62,9 @@ set(INC_SYS
 set(SRC 
        GPG_Application.cpp
        GPG_Canvas.cpp
-       GPG_ghost.cpp
        GPG_KeyboardDevice.cpp
        GPG_System.cpp
+       GPG_ghost.cpp
 
        GPG_Application.h
        GPG_Canvas.h
index 596a04f..8222bf4 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       KXNetwork
+       ../BlenderRoutines
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
+       ../../blender/python/mathutils
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenfont
-       ../../../source/blender/blenkernel
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/python/mathutils
-       ../../../source/blender 
-       ../../../source/blender/makesdna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -129,6 +128,10 @@ set(SRC
        KX_WorldInfo.cpp
        KX_WorldIpoController.cpp
 
+       BL_BlenderShader.h
+       BL_Material.h
+       BL_Shader.h
+       BL_Texture.h
        KX_ArmatureSensor.h
        KX_BlenderMaterial.h
        KX_BulletPhysicsController.h
@@ -201,10 +204,6 @@ set(SRC
        KX_VisibilityActuator.h
        KX_WorldInfo.h
        KX_WorldIpoController.h
-       BL_BlenderShader.h
-       BL_Material.h
-       BL_Shader.h
-       BL_Texture.h
 )
 
 add_definitions(-DGLEW_STATIC)
@@ -231,7 +230,7 @@ endif()
 if(WITH_BULLET)
        list(APPEND INC
                ../../../extern/bullet2/src
-               ../../../source/gameengine/Physics/Bullet
+               ../Physics/Bullet
        )
        add_definitions(-DUSE_BULLET)
 endif()
index b814956..1ebf115 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ..
+       ../../Expressions
+       ../../GameLogic
+       ../../Network
+       ../../SceneGraph
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS
index e1f3bfa..4d6d035 100644 (file)
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../intern/string
        ../../../intern/container
        ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS
index 9c39369..c816a30 100644 (file)
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ..
        ../../../../intern/container
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS
index aadd11c..971c8f9 100644 (file)
@@ -30,19 +30,19 @@ remove_strict_flags()
 set(INC
        .
        ../common
-       ../../../../extern/bullet2/src
-       ../../../../intern/moto/include
-       ../../../../intern/guardedalloc
-       ../../../../intern/container
-       ../../../../intern/string
-       ../../Rasterizer
-       ../../Ketsji
        ../../Expressions
        ../../GameLogic
+       ../../Ketsji
+       ../../Rasterizer
        ../../SceneGraph
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/makesdna
+       ../../../../extern/bullet2/src
+       ../../../../intern/container
+       ../../../../intern/guardedalloc
+       ../../../../intern/moto/include
+       ../../../../intern/string
 )
 
 set(INC_SYS
index b705d31..23d746f 100644 (file)
 
 set(INC
        .
-       ../../../source/blender/makesdna
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Ketsji
-       ../../../intern/string
+       ../Expressions
+       ../Ketsji
+       ../SceneGraph
+       ../../blender/makesdna
        ../../../intern/container
-       ../../../intern/moto/include
        ../../../intern/guardedalloc
-       ../Expressions
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS
index a005bb1..b0ef6fa 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ../../../../intern/string
+       ..
+       ../../BlenderRoutines
+       ../../Ketsji
+       ../../SceneGraph
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/makesdna
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/gpu
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenloader
+       ../../../../intern/string
 )
 
 set(INC_SYS
index c412363..04683a5 100644 (file)
 
 set(INC
        .
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/makesdna
-       ../../../source/blender/editors/include
-       ../../../source/blender/imbuf
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/gpu
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
        ../../../intern/container
-       ../../../intern/string
-       ../../../intern/moto/include
-       ../../../intern/guardedalloc
        ../../../intern/ffmpeg
+       ../../../intern/guardedalloc
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS