[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12044] branches/nurbs/blender: SConscript files as provided by mfoxdogg.

[Emmanuel Stone]

Revision: 12044
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12044
Author:   eman
Date:     2007-09-16 09:27:47 +0200 (Sun, 16 Sep 2007)

Log Message:
-----------
SConscript files as provided by mfoxdogg.
Also suggested adding nurbana.h to editcurve.c and buttons_editing.c to avoid 'implicit declaration' warning.
Thanks mfoxdogg.

Modified Paths:
--------------
    branches/nurbs/blender/intern/SConscript
    branches/nurbs/blender/source/blender/blenkernel/SConscript
    branches/nurbs/blender/source/blender/src/SConscript
    branches/nurbs/blender/source/blender/src/buttons_editing.c
    branches/nurbs/blender/source/blender/src/editcurve.c

Added Paths:
-----------
    branches/nurbs/blender/intern/nurbana/SConscript

Modified: branches/nurbs/blender/intern/SConscript
===================================================================
--- branches/nurbs/blender/intern/SConscript	2007-09-15 18:54:03 UTC (rev 12043)
+++ branches/nurbs/blender/intern/SConscript	2007-09-16 07:27:47 UTC (rev 12044)
@@ -12,7 +12,8 @@
             'decimation/SConscript',
             'iksolver/SConscript',
             'boolop/SConscript',
-            'opennl/SConscript'])
+            'opennl/SConscript',
+	    'nurbana/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult

Added: branches/nurbs/blender/intern/nurbana/SConscript
===================================================================
--- branches/nurbs/blender/intern/nurbana/SConscript	                        (rev 0)
+++ branches/nurbs/blender/intern/nurbana/SConscript	2007-09-16 07:27:47 UTC (rev 12044)
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+ 
+Import('env')
+ 
+sources = env.Glob('intern/*.cpp')
+incs = '../../intern/guardedalloc'
+ 
+env.BlenderLib ('bf_nurbana', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [12, 177] )

Modified: branches/nurbs/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/nurbs/blender/source/blender/blenkernel/SConscript	2007-09-15 18:54:03 UTC (rev 12043)
+++ branches/nurbs/blender/source/blender/blenkernel/SConscript	2007-09-16 07:27:47 UTC (rev 12044)
@@ -3,9 +3,9 @@
 
 sources = env.Glob('intern/*.c')
 
-incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
+incs = '. #/intern/guardedalloc #/intern/nurbana/extern ../include ../blenlib ../makesdna'
 incs += ' ../python ../render/extern/include #/intern/decimation/extern'
-incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
+incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes '
 incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 
 incs += ' ' + env['BF_OPENGL_INC']

Modified: branches/nurbs/blender/source/blender/src/SConscript
===================================================================
--- branches/nurbs/blender/source/blender/src/SConscript	2007-09-15 18:54:03 UTC (rev 12043)
+++ branches/nurbs/blender/source/blender/src/SConscript	2007-09-16 07:27:47 UTC (rev 12044)
@@ -5,7 +5,7 @@
 
 sources = env.Glob('*.c')
 
-incs = ' #/intern/guardedalloc #/intern/memutil'
+incs = ' #/intern/guardedalloc #/intern/memutil #/intern/nurbana/extern'
 incs += ' ../blenlib ../makesdna ../blenkernel'
 incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include'
 incs += ' #/intern/bsp/extern ../radiosity/extern/include'

Modified: branches/nurbs/blender/source/blender/src/buttons_editing.c
===================================================================
--- branches/nurbs/blender/source/blender/src/buttons_editing.c	2007-09-15 18:54:03 UTC (rev 12043)
+++ branches/nurbs/blender/source/blender/src/buttons_editing.c	2007-09-16 07:27:47 UTC (rev 12044)
@@ -42,6 +42,9 @@
 #endif
 
 #include "MEM_guardedalloc.h"
+
+#include "nurbana.h"
+
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_scene_types.h"

Modified: branches/nurbs/blender/source/blender/src/editcurve.c
===================================================================
--- branches/nurbs/blender/source/blender/src/editcurve.c	2007-09-15 18:54:03 UTC (rev 12043)
+++ branches/nurbs/blender/source/blender/src/editcurve.c	2007-09-16 07:27:47 UTC (rev 12044)
@@ -44,6 +44,7 @@
 #endif
 #include <stdlib.h>
 #include "MEM_guardedalloc.h"
+#include "nurbana.h"
 
 #include "BMF_Api.h"