[Bf-blender-cvs] [feba2d3] master: Attempt to fix compilation error on ubuntu linux

[Sergey Sharybin]

Commit: feba2d3edf25b9c20bdd85d399c8f67123acf680
Author: Sergey Sharybin
Date:   Mon Sep 8 14:28:50 2014 +0600
Branches: master
https://developer.blender.org/rBfeba2d3edf25b9c20bdd85d399c8f67123acf680

Attempt to fix compilation error on ubuntu linux

===================================================================

M	SConstruct
M	build_files/scons/tools/Blender.py

===================================================================

diff --git a/SConstruct b/SConstruct
index c74caa2..d1d0db9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -834,11 +834,6 @@ creob = B.creator(env)
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
-# Hack to pass OSD libraries to linker before extern_{clew,cuew}
-for x in B.create_blender_liblist(env, 'system'):
-    thesyslibs.append(os.path.basename(x))
-    thelibincs.append(os.path.dirname(x))
-
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
     blender_progname = "blender"
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index dcbf7e5..b5853b2 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -248,6 +248,11 @@ def setup_staticlibs(lenv):
         libincs = [e for e in libincs if SCons.Subst.scons_subst(e, lenv, gvars=lenv.Dictionary()) != "/usr/lib"]
         libincs.append('/usr/lib')
 
+    # Hack to pass OSD libraries to linker before extern_{clew,cuew}
+    # Here we only store library path, actual library name will be added in setup_syslibs()
+    for syslib in create_blender_liblist(lenv, 'system'):
+        libincs.append(os.path.dirname(syslib))
+
     return statlibs, libincs
 
 def setup_syslibs(lenv):
@@ -339,6 +344,10 @@ def setup_syslibs(lenv):
     if not lenv['WITH_BF_STATICPNG']:
         syslibs += Split(lenv['BF_PNG_LIB'])
 
+    # Hack to pass OSD libraries to linker before extern_{clew,cuew}
+    for syslib in create_blender_liblist(lenv, 'system'):
+        syslibs.append(os.path.basename(syslib))
+
     syslibs += lenv['LLIBS']
 
     return syslibs