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

diff --git a/SConstruct b/SConstruct
index 8593b7eb52f51777def98535e1ed0fb2944233c2..ffcfdc10436d45bf955b36e64ff0ffdd1f086b37 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -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

diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 1ae042d5b7b67ddfb1396c0509d387f087973837..8060b6d27a30e03118b6cf15448f3c20f8118743 100644 (file)
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -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'

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 319c9b264f2966702a0ec793bfc7a2c8cb202db9..f44f6a247b9539623d350428b19c51b91f7eacfa 100644 (file)
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -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'