diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
| commit | 9424b1ceff992f420fe6315acabfb7138cd0026e (patch) | |
| tree | 2f19cac8af2ad32852cf9c46cb542e14fabe8d9b /source/gameengine/Ketsji/CMakeLists.txt | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
| parent | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (diff) | |
Merging pepper to trunk at revision 39791.
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
Diffstat (limited to 'source/gameengine/Ketsji/CMakeLists.txt')
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 8222bf4b65f..99c9fb25a65 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -45,6 +45,7 @@ set(INC ../../blender/gpu ../../blender/imbuf ../../blender/makesdna + ../../blender/makesrna ../../blender/python ../../blender/python/generic ../../blender/python/mathutils @@ -59,6 +60,8 @@ set(INC_SYS ) set(SRC + BL_Action.cpp + BL_ActionManager.cpp BL_BlenderShader.cpp BL_Material.cpp BL_Shader.cpp @@ -128,6 +131,8 @@ set(SRC KX_WorldInfo.cpp KX_WorldIpoController.cpp + BL_Action.h + BL_ActionManager.h BL_BlenderShader.h BL_Material.h BL_Shader.h @@ -223,6 +228,7 @@ endif() if(WITH_AUDASPACE) list(APPEND INC ../../../intern/audaspace/intern + ../../../intern/audaspace/FX ) add_definitions(-DWITH_AUDASPACE) endif() |