diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-06-05 16:55:32 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-06-05 16:55:32 +0400 |
| commit | 2403214cb474fe71c0fd9b42a6c0155c8159b7b3 (patch) | |
| tree | 868e36daa21590e4ac1261ad9a450d1d1068747b /tools | |
| parent | 24d5a1ce3a043929628a0330859366a239be16cc (diff) | |
Moving FFMPEG lib path include to first in the list. This might fix '[#21312] 2.5 Fails to Build Against Latest FFMPEG svn'
PS. note the nice palindromic bug report number.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index d1a2170b032..6356210b113 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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 |