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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-25 04:49:43 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-25 04:49:43 +0400
commit54db7f1b43b08f3bfd0ce28b24f8ed22e82282cf (patch)
treefbfe78a18ab66b48854c4cda2020df284c16c21b /source/blender/freestyle
parentd54b2391c4b0c862aa4991f467bf724bb811048e (diff)
Buildbot: disable command length workaround for now, seems to give link errors.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/SConscript13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 2542bbd1ec6..cae04f8642c 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -78,11 +78,14 @@ sources = system_sources + image_sources + geometry_sources + scene_graph_source
winged_edge_sources + view_map_sources + stroke_sources + \
application_sources + interface_sources
-env.BlenderLib(libname="bf_freestyle", sources=sources, includes=Split(incs),
- defines=defs, libtype=['core'], priority = [370]
-)
+if False: # gives link errors 'win' in env['OURPLATFORM']:
+ env.BlenderLib(libname="bf_freestyle_python", sources=python_sources, includes=Split(incs),
+ defines=defs, libtype=['core'], priority = [369] # bf_python is 361
+ )
+else:
+ sources += python_sources
-env.BlenderLib(libname="bf_freestyle_python", sources=python_sources, includes=Split(incs),
- defines=defs, libtype=['core'], priority = [369] # bf_python is 361
+env.BlenderLib(libname="bf_freestyle", sources=sources, includes=Split(incs),
+ defines=defs, libtype=['core'], priority = [370] # bf_python is 361
)