Revision: 23587
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23587
Author: theeth
Date: 2009-10-01 18:32:33 +0200 (Thu, 01 Oct 2009)
Log Message:
-----------
Fixing scons compile on windows.
Since bli_threads.h now includes pthreads directly, we need to had instructions
in SConscripts everywhere for proper include path.
Frankly, I feel like this should be done in a global manner and not in a per
lib fashion, but that is for another day.
This commit also fixes more missing properties
Modified Paths:
--------------
trunk/blender/source/blender/blenpluginapi/SConscript
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/mesh/SConscript
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/editors/render/SConscript
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_console/SConscript
trunk/blender/source/blender/editors/space_file/SConscript
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_sound/SConscript
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/windowmanager/SConscript
Property Changed:
----------------
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/editors/SConscript
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/curve/SConscript
trunk/blender/source/blender/editors/datafiles/SConscript
trunk/blender/source/blender/editors/gpencil/SConscript
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/metaball/SConscript
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/render/SConscript
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_console/SConscript
trunk/blender/source/blender/editors/space_file/SConscript
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_image/SConscript
trunk/blender/source/blender/editors/space_info/SConscript
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_outliner/SConscript
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_sequencer/SConscript
trunk/blender/source/blender/editors/space_sound/SConscript
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_time/SConscript
trunk/blender/source/blender/editors/space_userpref/SConscript
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/editors/uvedit/SConscript
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/blender/ikplugin/SConscript
trunk/blender/source/blender/imbuf/intern/dds/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/windowmanager/SConscript
Property changes on: trunk/blender/source/blender/blenfont/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/blenpluginapi/SConscript
===================================================================
--- trunk/blender/source/blender/blenpluginapi/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/blenpluginapi/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -11,4 +11,11 @@
defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC']
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes =
Split(incs), defines = defs, libtype=['core'], priority = [170] )
Property changes on: trunk/blender/source/blender/editors/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/animation/SConscript
===================================================================
--- trunk/blender/source/blender/editors/animation/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/animation/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -1,9 +1,9 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('*.c')
-
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna
../../makesrna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-
-env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [],
libtype=['core'], priority=[125] )
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna
../../makesrna ../../imbuf'
+incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+
+env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [],
libtype=['core'], priority=[125] )
Property changes on: trunk/blender/source/blender/editors/animation/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/armature/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -8,4 +8,11 @@
incs += ' ../../render/extern/include #/intern/guardedalloc'
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [],
libtype=['core'], priority=[44] )
Property changes on: trunk/blender/source/blender/editors/curve/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: trunk/blender/source/blender/editors/datafiles/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: trunk/blender/source/blender/editors/gpencil/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: trunk/blender/source/blender/editors/interface/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/mesh/SConscript
===================================================================
--- trunk/blender/source/blender/editors/mesh/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/mesh/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -8,4 +8,11 @@
incs += ' #/intern/guardedalloc ../../gpu'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), [],
libtype=['core'], priority=[45] )
Property changes on: trunk/blender/source/blender/editors/metaball/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/object/SConscript
===================================================================
--- trunk/blender/source/blender/editors/object/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/object/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -1,16 +1,16 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('*.c')
-
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' #/intern/guardedalloc'
-incs += ' ../../makesrna ../../python ../../ikplugin'
-
-defs = []
-
-if not env['WITH_BF_PYTHON']:
- defs.append('DISABLE_PYTHON')
-
-env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs,
libtype=['core'], priority=[35] )
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' ../../windowmanager #/intern/guardedalloc'
+incs += ' #/intern/guardedalloc'
+incs += ' ../../makesrna ../../python ../../ikplugin'
+
+defs = []
+
+if not env['WITH_BF_PYTHON']:
+ defs.append('DISABLE_PYTHON')
+
+env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs,
libtype=['core'], priority=[35] )
Property changes on: trunk/blender/source/blender/editors/object/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/physics/SConscript
===================================================================
--- trunk/blender/source/blender/editors/physics/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/physics/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -8,4 +8,11 @@
incs += ' #/intern/guardedalloc ../../gpu'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), [],
libtype=['core'], priority=[45] )
Modified: trunk/blender/source/blender/editors/render/SConscript
===================================================================
--- trunk/blender/source/blender/editors/render/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/render/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -9,4 +9,11 @@
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
incs += ' ../../blenloader'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [],
libtype=['core'], priority=[45] )
Property changes on: trunk/blender/source/blender/editors/render/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/screen/SConscript
===================================================================
--- trunk/blender/source/blender/editors/screen/SConscript 2009-10-01
16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/screen/SConscript 2009-10-01
16:32:33 UTC (rev 23587)
@@ -15,4 +15,11 @@
if env['WITH_BF_OPENEXR']:
defs += ' WITH_OPENEXR'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs),
libtype=['core'], priority=[105] )
Property changes on: trunk/blender/source/blender/editors/screen/SConscript
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/SConscript
2009-10-01 16:30:05 UTC (rev 23586)
+++ trunk/blender/source/blender/editors/sculpt_paint/SConscript
2009-10-01 16:32:33 UTC (rev 23587)
@@ -8,4 +8,11 @@
incs += ' ../../render/extern/include #/intern/guardedalloc'
incs += ' ../../gpu ../../makesrna'
+if env['OURPLATFORM'] == 'linux2':
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs), [],
libtype=['core'], priority=[40] )
Property changes on:
trunk/blender/source/blender/editors/sculpt_paint/SConscript
___________________________________________________________________
Name: svn:eol-style
- LF
+ native
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
