Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Poirier <theeth@yahoo.com>2009-10-01 20:32:33 +0400
committerMartin Poirier <theeth@yahoo.com>2009-10-01 20:32:33 +0400
commit15d81b21f6db8656b4784729b307a0a147c8e362 (patch)
treefce19a3d2dec5d75984407d44cc8f8badc871f4c /source/blender/editors/render/SConscript
parent37a729cb1d3aa4957a40f30267bb784c2376cf89 (diff)
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
Diffstat (limited to 'source/blender/editors/render/SConscript')
-rw-r--r--source/blender/editors/render/SConscript7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index cca2ab9b2ab..bddc5ed10e0 100644
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -9,4 +9,11 @@ incs += ' #/intern/guardedalloc ../../gpu'
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] )