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:
authorCampbell Barton <ideasman42@gmail.com>2013-03-28 02:24:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-28 02:24:38 +0400
commitf13829c7826e61c14d78f20bd347228f01367706 (patch)
treeb4ccd417411dbbcef50187169a285ce5953578af /source/blender/editors/render/SConscript
parent765a10a8cdaa09ba7ffb06139c05255948d41518 (diff)
parentd15d78a33a8df76b02fa0d27dacd85c8a77ec109 (diff)
svn merge ^/trunk/blender -r55594:55635
Diffstat (limited to 'source/blender/editors/render/SConscript')
-rw-r--r--source/blender/editors/render/SConscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index 25af8080d51..4c5da4dc78a 100644
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -35,6 +35,8 @@ incs += ' ../../gpu'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
incs += ' ../../blenloader ../../bmesh ../../blenfont'
+defs = []
+
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
@@ -57,4 +59,7 @@ if env['OURPLATFORM'] == 'darwin':
if env['WITH_BF_OPENMP']:
env.Append(CFLAGS=['-DPARALLEL=1'])
-env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45])
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib('bf_editors_render', sources, Split(incs), defs, libtype=['core'], priority=[45])