diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-08 16:54:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-08 16:54:39 +0300 |
| commit | b08f15aa08cb4b3522b5265118f533cc438c67d9 (patch) | |
| tree | ac25cb9dfa00440bd1290c5cc6d6d5cf6a950c9c /source | |
| parent | 8e095b0e64216f574c702552d8d366869759f83b (diff) | |
2.5: make and cmake fixes for recent changes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 2cacdf27985..29f3614666b 100644 --- a/source/Makefile +++ b/source/Makefile @@ -237,8 +237,8 @@ PULIB += $(OCGDIR)/blender/ed_time/libed_time.a PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a PULIB += $(OCGDIR)/blender/ed_object/libed_object.a -PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a +PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a PULIB += $(OCGDIR)/blender/ed_util/libed_util.a diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 8f11928e63f..3948a2bf2af 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -33,6 +33,7 @@ SET(INC ../../../intern/iksolver/extern ../blenloader ../quicktime ../../../intern/bmfont ../../../extern/bullet2/src ../nodes ../../../extern/glew/include ../gpu ../makesrna + ../../../intern/bsp/extern ${SDL_INC} ${ZLIB_INC} ) |