[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28957] trunk/blender: Changes for static linking to libtiff when compiling by MinGW:

[Sergey Sharybin]

Revision: 28957
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28957
Author:   nazgul
Date:     2010-05-24 14:41:14 +0200 (Mon, 24 May 2010)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/linuxcross-config.py
    trunk/blender/config/win32-mingw-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-05-24 12:18:12 UTC (rev 28956)
+++ trunk/blender/SConstruct	2010-05-24 12:41:14 UTC (rev 28957)
@@ -572,7 +572,9 @@
 		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

Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py	2010-05-24 12:18:12 UTC (rev 28956)
+++ trunk/blender/config/linuxcross-config.py	2010-05-24 12:41:14 UTC (rev 28957)
@@ -75,7 +75,7 @@
 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'

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2010-05-24 12:18:12 UTC (rev 28956)
+++ trunk/blender/config/win32-mingw-config.py	2010-05-24 12:41:14 UTC (rev 28957)
@@ -74,7 +74,7 @@
 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'