forked from bartvdbraak/blender
Changes for static linking to libtiff when compiling by MinGW:
- Use static tiff libraries from lib/windows/gcc in scons configuration files - Commented libtiff.dll installation in SConstruct
This commit is contained in:
parent
8c767ce0e8
commit
4324dc8389
@ -572,7 +572,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
|
||||
dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
|
||||
'${BF_ZLIB_LIBPATH}/zlib.dll']
|
||||
|
||||
dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
|
||||
# Used when linking to libtiff was dynamic
|
||||
# keep it here until compilation on all platform would be ok
|
||||
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
|
||||
|
||||
if env['OURPLATFORM'] != 'linuxcross':
|
||||
# pthreads library is already added
|
||||
|
@ -75,7 +75,7 @@ BF_PNG_LIB = 'png'
|
||||
BF_PNG_LIBPATH = '${BF_PNG}/lib'
|
||||
|
||||
WITH_BF_TIFF = True
|
||||
BF_TIFF = LIBDIR + '/tiff'
|
||||
BF_TIFF = LIBDIR + '/gcc/tiff'
|
||||
BF_TIFF_INC = '${BF_TIFF}/include'
|
||||
BF_TIFF_LIB = 'libtiff'
|
||||
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
|
||||
|
@ -74,7 +74,7 @@ BF_PNG_LIB = 'png'
|
||||
BF_PNG_LIBPATH = '${BF_PNG}/lib'
|
||||
|
||||
WITH_BF_TIFF = True
|
||||
BF_TIFF = LIBDIR + '/tiff'
|
||||
BF_TIFF = LIBDIR + '/gcc/tiff'
|
||||
BF_TIFF_INC = '${BF_TIFF}/include'
|
||||
BF_TIFF_LIB = 'libtiff'
|
||||
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
|
||||
|
Loading…
Reference in New Issue
Block a user