2.5: make and cmake fixes for recent changes.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 8 Jan 2009 13:54:39 +0000 (13:54 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 8 Jan 2009 13:54:39 +0000 (13:54 +0000)
intern/ghost/Makefile
source/Makefile
source/blender/blenkernel/CMakeLists.txt

index c5a9c52265554bdc6d7dcdd90c98eacb017a1dfb..f809a32ac8f829aa29e269d26d2f6d7ab9589732 100644 (file)
@@ -38,7 +38,7 @@ TESTDIRS = test
 
 include nan_subdirs.mk
 
-install: all
+install: all debug
        @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST)
        @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include
        @[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib
index 2cacdf27985deee7693e166af658a9404e872143..29f3614666bbcf9b3e8c03f201326d59a50464cb 100644 (file)
@@ -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
index 8f11928e63f65df21580ddd5260e796c9a84c409..3948a2bf2afd388955d2d961f3cfb01305ed4f06 100644 (file)
@@ -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}
 )