Moving FFMPEG lib path include to first in the list. This might fix '[#21312] 2.5...
authorNathan Letwory <nathan@letworyinteractive.com>
Sat, 5 Jun 2010 12:55:32 +0000 (12:55 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sat, 5 Jun 2010 12:55:32 +0000 (12:55 +0000)
PS. note the nice palindromic bug report number.

tools/Blender.py

index d1a2170b0321b181670ac9d98a6f62cb193a208a..6356210b113dae157f5bbfbf067e6ed6d3f9d7a4 100644 (file)
@@ -119,8 +119,9 @@ def setup_staticlibs(lenv):
        ]
 
        libincs = []
-       if lenv['OURPLATFORM'] != 'linuxcross':
-               libincs.append('/usr/lib')
+
+       if lenv['WITH_BF_FFMPEG']:
+               libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
 
        libincs.extend([
                lenv['BF_OPENGL_LIBPATH'],
@@ -136,8 +137,6 @@ def setup_staticlibs(lenv):
                libincs += Split(lenv['BF_PYTHON_LIBPATH'])
        if lenv['WITH_BF_SDL']:
                libincs += Split(lenv['BF_SDL_LIBPATH'])
-       if lenv['WITH_BF_FFMPEG']:
-               libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
        if lenv['WITH_BF_JACK']:
                libincs += Split(lenv['BF_JACK_LIBPATH'])
        if lenv['WITH_BF_SNDFILE']:
@@ -177,6 +176,9 @@ def setup_staticlibs(lenv):
                if lenv['OURPLATFORM'] == 'linuxcross':
                        libincs += Split(lenv['BF_OPENMP_LIBPATH'])
 
+       # setting this last so any overriding of manually libs could be handled
+       if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
+               libincs.append('/usr/lib')
 
        return statlibs, libincs