Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2010-05-24 16:41:14 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2010-05-24 16:41:14 +0400
commit4324dc8389584a9e6a167244633408a5b887ee40 (patch)
tree5f8c8bbd2e0dfbb5a5dff6c08a74ed54f2284021 /SConstruct
parent8c767ce0e88d611c95a21e97ee08c512cdd9392e (diff)
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
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 8593b7eb52f..ffcfdc10436 100644
--- 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