forked from bartvdbraak/blender
Change scon's ordering of static libraries to resolve problem on Linux 64-bit builds.
This commit is contained in:
parent
252928ab36
commit
6b48e25ba4
@ -126,8 +126,6 @@ def setup_staticlibs(lenv):
|
||||
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 @@ def setup_staticlibs(lenv):
|
||||
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'])
|
||||
|
Loading…
Reference in New Issue
Block a user