[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25342] trunk/blender/source/blender/ blenkernel: fixing scons and makefile compile.

Andrea Weikert elubie at gmx.net
Sun Dec 13 20:45:23 CET 2009


Revision: 25342
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25342
Author:   elubie
Date:     2009-12-13 20:45:23 +0100 (Sun, 13 Dec 2009)

Log Message:
-----------
fixing scons and makefile compile.
* added include path due to added bad level #include "WM_api.h"

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/blenkernel/intern/Makefile

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2009-12-13 19:25:05 UTC (rev 25341)
+++ trunk/blender/source/blender/blenkernel/SConscript	2009-12-13 19:45:23 UTC (rev 25342)
@@ -3,7 +3,8 @@
 
 sources = env.Glob('intern/*.c')
 
-incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include ../blenlib ../blenfont ../makesdna'
+incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include'
+incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
 incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
 incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes'
 incs += ' #/intern/iksolver/extern ../blenloader'

Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile	2009-12-13 19:25:05 UTC (rev 25341)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile	2009-12-13 19:45:23 UTC (rev 25342)
@@ -53,6 +53,8 @@
 CPPFLAGS += -I../../blenloader
 CPPFLAGS += -I../../python
 CPPFLAGS += -I../../blenfont
+# This is bad level, remove eventually
+CPPFLAGS += -I../../windowmanager
 # also avi is used
 CPPFLAGS += -I../../avi
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include





More information about the Bf-blender-cvs mailing list