[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18416] branches/blender2.5/blender: 2.5: make and cmake fixes for recent changes.

[Brecht Van Lommel]

Revision: 18416
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18416
Author:   blendix
Date:     2009-01-08 14:54:39 +0100 (Thu, 08 Jan 2009)

Log Message:
-----------
2.5: make and cmake fixes for recent changes.

Modified Paths:
--------------
    branches/blender2.5/blender/intern/ghost/Makefile
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt

Modified: branches/blender2.5/blender/intern/ghost/Makefile
===================================================================
--- branches/blender2.5/blender/intern/ghost/Makefile	2009-01-08 11:14:58 UTC (rev 18415)
+++ branches/blender2.5/blender/intern/ghost/Makefile	2009-01-08 13:54:39 UTC (rev 18416)
@@ -38,7 +38,7 @@
 
 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

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2009-01-08 11:14:58 UTC (rev 18415)
+++ branches/blender2.5/blender/source/Makefile	2009-01-08 13:54:39 UTC (rev 18416)
@@ -237,8 +237,8 @@
 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_armature/libed_armature.a
 PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
-PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.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

Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt	2009-01-08 11:14:58 UTC (rev 18415)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt	2009-01-08 13:54:39 UTC (rev 18416)
@@ -33,6 +33,7 @@
   ../../../intern/iksolver/extern ../blenloader ../quicktime
   ../../../intern/bmfont ../../../extern/bullet2/src
   ../nodes ../../../extern/glew/include ../gpu ../makesrna
+  ../../../intern/bsp/extern
   ${SDL_INC}
   ${ZLIB_INC}
 )