[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19919] trunk/blender/tools/Blender.py: Change scon' s ordering of static libraries to resolve problem on Linux 64-bit builds.
Ken Hughes
khughes at pacific.edu
Fri Apr 24 22:17:43 CEST 2009
Revision: 19919
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19919
Author: khughes
Date: 2009-04-24 22:17:42 +0200 (Fri, 24 Apr 2009)
Log Message:
-----------
Change scon's ordering of static libraries to resolve problem on Linux 64-bit builds.
Modified Paths:
--------------
trunk/blender/tools/Blender.py
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2009-04-24 19:49:15 UTC (rev 19918)
+++ trunk/blender/tools/Blender.py 2009-04-24 20:17:42 UTC (rev 19919)
@@ -126,8 +126,6 @@
libincs += Split(lenv['BF_SDL_LIBPATH'])
if lenv['WITH_BF_FFMPEG']:
libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
- if lenv['WITH_BF_STATICCXX']:
- statlibs += Split(lenv['BF_CXX_LIB_STATIC'])
if lenv['WITH_BF_OPENEXR']:
libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
if lenv['WITH_BF_STATICOPENEXR']:
@@ -141,6 +139,8 @@
statlibs += Split(lenv['BF_OPENAL_LIB_STATIC'])
if lenv['WITH_BF_STATICOPENGL']:
statlibs += Split(lenv['BF_OPENGL_LIB_STATIC'])
+ if lenv['WITH_BF_STATICCXX']:
+ statlibs += Split(lenv['BF_CXX_LIB_STATIC'])
if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']:
statlibs += Split(lenv['BF_PYTHON_LIB_STATIC'])
More information about the Bf-blender-cvs
mailing list