Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)

Browse Source 
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
This commit is contained in:
Dalai Felinto
2010-05-29 21:31:57 +00:00
parent 9d3157eed0
commit c6bec43330
29 changed files with 251 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/linuxcross-config.py
View File

@@ -55,7 +55,7 @@ WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
BF_OPENEXR = LIBDIR + '/gcc/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIB = ' Half IlmImf Iex IlmThread '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'