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

Changes for static linking to libtiff when compiling by MinGW:

Browse Source 
- Use static tiff libraries from lib/windows/gcc in
  scons configuration files
- Commented libtiff.dll installation in SConstruct
This commit is contained in:
Sergey Sharybin
2010-05-24 12:41:14 +00:00
parent 8c767ce0e8
commit 4324dc8389
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -572,7 +572,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources += ['${BF_PNG_LIBPATH}/libpng.dll', dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
'${BF_ZLIB_LIBPATH}/zlib.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': if env['OURPLATFORM'] != 'linuxcross':
# pthreads library is already added # pthreads library is already added

2
config/linuxcross-config.py
View File

@@ -75,7 +75,7 @@ BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff' BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include' BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff' BF_TIFF_LIB = 'libtiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib' BF_TIFF_LIBPATH = '${BF_TIFF}/lib'

2
config/win32-mingw-config.py
View File

@@ -74,7 +74,7 @@ BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff' BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include' BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff' BF_TIFF_LIB = 'libtiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib' BF_TIFF_LIBPATH = '${BF_TIFF}/lib'