diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
commit | 225c5fee6b046b9829643f82cf6cbce159e4e007 (patch) | |
tree | 4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/gameengine | |
parent | 60befcdc6297281ce226273123d3ccfc0a681aff (diff) |
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Expressions/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/ListValue.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/SConscript | 13 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MaterialIpoController.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt | 1 |
6 files changed, 14 insertions, 8 deletions
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index df2ad2dffa7..0c7d79b4cda 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -26,7 +26,7 @@ set(INC . ../SceneGraph - ../../blender/blenloader + ../../blender/blenlib ../../../intern/guardedalloc ../../../intern/moto/include ../../../intern/string diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index c40394eceb1..1f12a9b78e1 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -25,7 +25,7 @@ #include <algorithm> #include "BoolValue.h" -#include "BLO_sys_types.h" /* for intptr_t support */ +#include "BLI_sys_types.h" /* for intptr_t support */ ////////////////////////////////////////////////////////////////////// diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index a6d82a4f2da..c553aaca2cc 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -29,15 +29,22 @@ Import ('env') sources = env.Glob('*.cpp') -incs ='. #intern/guardedalloc #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader' +incs = [ + '.', + '#intern/guardedalloc', + '#intern/string', + '#intern/moto/include', + '#source/gameengine/SceneGraph', + '#source/blender/blenlib', + ] defs = [] if env['WITH_BF_PYTHON']: - incs += ' ' + env['BF_PYTHON_INC'] + incs.append(env['BF_PYTHON_INC']) defs.append('WITH_PYTHON') if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') -env.BlenderLib ( 'ge_logic_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib('ge_logic_expressions', sources, incs, defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp index 9a19cb08fad..a11392e9464 100644 --- a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp +++ b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp @@ -6,7 +6,7 @@ #include "KX_ScalarInterpolator.h" #include "KX_GameObject.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support bool KX_MaterialIpoController::Update(double currentTime) { diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 0690bdd6538..1a479298d1a 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -45,7 +45,7 @@ incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/pyth incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' incs += ' #source/gameengine/Physics/Dummy' -incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' +incs += ' #source/blender/misc #extern/glew/include #source/blender/gpu' incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include' incs += ' ' + env['BF_BULLET_INC'] diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index 11cb4b1d9f9..d61f90378bb 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../../SceneGraph ../../../blender/blenkernel ../../../blender/blenlib - ../../../blender/blenloader ../../../blender/gpu ../../../blender/makesdna ../../../../intern/container |