Revision: 29238
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29238
Author: jesterking
Date: 2010-06-05 14:55:32 +0200 (Sat, 05 Jun 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/tools/Blender.py
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2010-06-05 12:29:24 UTC (rev 29237)
+++ trunk/blender/tools/Blender.py 2010-06-05 12:55:32 UTC (rev 29238)
@@ -119,9 +119,10 @@
]
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'],
lenv['BF_JPEG_LIBPATH'],
@@ -136,8 +137,6 @@
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 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
