diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-10 17:36:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-10 17:36:27 +0400 |
| commit | 353713afe827610501f0123b44b0054f49bf56ed (patch) | |
| tree | de966b9d426b06708e37ad647a145e0940e4f535 /source/blender/python/intern/CMakeLists.txt | |
| parent | fce87339750d50303f8b0324d88b517a10b76d52 (diff) | |
| parent | 322dbc9a0fa7d0e1c82fa2968728cbfc5c536445 (diff) | |
Merged changes in the trunk up to revision 40096.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
Note for branch builders: Enabling Blender Player may cause linker errors.
Diffstat (limited to 'source/blender/python/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index d6a41b561fd..3ad5e000233 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -32,6 +32,7 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager + ../../gpu ../../freestyle/intern/python ../../../../intern/guardedalloc ) @@ -41,6 +42,7 @@ set(INC_SYS ) set(SRC + gpu.c bpy.c bpy_app.c bpy_app_handlers.c @@ -59,6 +61,7 @@ set(SRC bpy_util.c stubs.c + gpu.h bpy.h bpy_app.h bpy_app_handlers.h |