[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18390] branches/nurbs/blender/source: CCMake file changes were also lost during the merge.

[Emmanuel Stone]

Revision: 18390
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18390
Author:   eman
Date:     2009-01-07 00:41:16 +0100 (Wed, 07 Jan 2009)

Log Message:
-----------
CCMake file changes were also lost during the merge.
Restored.

Modified Paths:
--------------
    branches/nurbs/blender/source/blender/src/CMakeLists.txt
    branches/nurbs/blender/source/creator/CMakeLists.txt

Modified: branches/nurbs/blender/source/blender/src/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/source/blender/src/CMakeLists.txt	2009-01-06 23:38:40 UTC (rev 18389)
+++ branches/nurbs/blender/source/blender/src/CMakeLists.txt	2009-01-06 23:41:16 UTC (rev 18390)
@@ -36,6 +36,7 @@
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern
   ../nodes ../../../extern/glew/include ../gpu
+  ../../../intern/nurbana/extern
   ${PYTHON_INC}
   ${SDL_INC}
 )

Modified: branches/nurbs/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/source/creator/CMakeLists.txt	2009-01-06 23:38:40 UTC (rev 18389)
+++ branches/nurbs/blender/source/creator/CMakeLists.txt	2009-01-06 23:41:16 UTC (rev 18390)
@@ -157,6 +157,7 @@
     COMMAND copy /Y \"${WIN_LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\tiff\\lib\\libtiff.dll\" \"${TARGETDIR}\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python25.dll\" \"${TARGETDIR}\\\"
+    COMMAND copy /Y \"${WIN_LIBDIR}\\python\\lib\\python25_d.dll\" \"${TARGETDIR}\\\"
     COMMAND copy /Y \"${WIN_LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
   )
 
@@ -235,6 +236,7 @@
     bf_guardedalloc 
     blender_CTR 
     bf_moto 
+    bf_nurbana
     bf_bmfont 
     verse 
     src