[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13026] branches/blender2.5/blender/source : * added SConscript for windowmanager
Nathan Letwory
jesterking at letwory.net
Thu Dec 27 23:16:54 CET 2007
Revision: 13026
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13026
Author: jesterking
Date: 2007-12-27 23:16:54 +0100 (Thu, 27 Dec 2007)
Log Message:
-----------
* added SConscript for windowmanager
* tweak other SConscripts for editors/include
* commented BKE_bad_level_calls.h in writeframeserver.c - please check it doesn't break make builds
This compiles until final linking, which still fails.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/SConscript
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenloader/SConscript
branches/blender2.5/blender/source/blender/ftfont/SConscript
branches/blender2.5/blender/source/blender/nodes/SConscript
branches/blender2.5/blender/source/blender/radiosity/SConscript
branches/blender2.5/blender/source/blender/render/SConscript
branches/blender2.5/blender/source/blender/yafray/SConscript
branches/blender2.5/blender/source/creator/SConscript
Added Paths:
-----------
branches/blender2.5/blender/source/blender/windowmanager/SConscript
Modified: branches/blender2.5/blender/source/blender/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -13,7 +13,8 @@
'radiosity/SConscript',
'readblenfile/SConscript',
'render/SConscript',
- 'nodes/SConscript'])
+ 'nodes/SConscript',
+ 'windowmanager/SConscript'])
if env['WITH_BF_YAFRAY'] == 1:
SConscript(['yafray/SConscript'])
Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -3,7 +3,7 @@
sources = env.Glob('intern/*.c')
-incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
+incs = '. #/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
incs += ' ../python ../render/extern/include #/intern/decimation/extern'
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c 2007-12-27 22:16:54 UTC (rev 13026)
@@ -47,7 +47,7 @@
#include "BLI_blenlib.h"
#include "DNA_userdef_types.h"
-#include "BKE_bad_level_calls.h"
+/*#include "BKE_bad_level_calls.h"*/
#include "BKE_global.h"
#include "IMB_imbuf_types.h"
Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
cflags=''
-incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include'
+incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include'
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_ZLIB_INC']
incs += ' ' + env['BF_SDL_INC']
Modified: branches/blender2.5/blender/source/blender/blenloader/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/blenloader/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
-incs += ' ../makesdna ../readblenfile ../include'
+incs += ' ../makesdna ../readblenfile ../editors/include'
incs += ' ../python ../../kernel/gen_messaging'
incs += ' ../render/extern/include'
Modified: branches/blender2.5/blender/source/blender/ftfont/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/ftfont/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/ftfont/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.cpp')
-incs = '. intern ../blenkernel ../blenlib ../makesdna ../include'
+incs = '. intern ../blenkernel ../blenlib ../makesdna ../editors/include'
incs += ' ' + env['BF_FTGL_INC']
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_GETTEXT_INC']
Modified: branches/blender2.5/blender/source/blender/nodes/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/nodes/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -6,7 +6,7 @@
sources += env.Glob('intern/SHD_nodes/*.c')
incs = '. ./intern '
-incs += '#/intern/guardedalloc ../include ../blenlib ../makesdna'
+incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
incs += ' ../python ../render/extern/include '
incs += ' ../imbuf ../avi '
incs += ' ../blenloader ../quicktime'
Modified: branches/blender2.5/blender/source/blender/radiosity/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/radiosity/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -3,7 +3,7 @@
sources = env.Glob('intern/source/*.c')
-incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../include'
+incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../editors/include'
incs += ' #/intern/guardedalloc ../render/extern/include'
incs += ' ../render/intern/include'
Modified: branches/blender2.5/blender/source/blender/render/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/render/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/render/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -6,7 +6,7 @@
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../quicktime ../include ../../kernel/gen_messaging'
+incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging'
defs = []
Added: branches/blender2.5/blender/source/blender/windowmanager/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/SConscript (rev 0)
+++ branches/blender2.5/blender/source/blender/windowmanager/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('intern/*.c')
+
+#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
+#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include'
+
+incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
+incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
+incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system'
+
+incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont'
+incs += ' #/intern/elbeem'
+env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
Modified: branches/blender2.5/blender/source/blender/yafray/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/yafray/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/blender/yafray/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -4,6 +4,6 @@
sources = env.Glob('intern/*.cpp')
incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
-incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include'
+incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include'
env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
Modified: branches/blender2.5/blender/source/creator/SConscript
===================================================================
--- branches/blender2.5/blender/source/creator/SConscript 2007-12-27 21:35:25 UTC (rev 13025)
+++ branches/blender2.5/blender/source/creator/SConscript 2007-12-27 22:16:54 UTC (rev 13026)
@@ -4,8 +4,8 @@
sources = 'creator.c'
incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
-incs += ' ../blender/include ../blender/blenloader ../blender/imbuf'
-incs += ' ../blender/renderconverter ../blender/render/extern/include'
+incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf'
+incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager'
incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
incs += ' ../kernel/gen_system'
incs += ' ' + env['BF_OPENGL_INC']
More information about the Bf-blender-cvs
mailing list