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
path: root/config
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 /config
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 'config')
-rw-r--r--config/linuxcross-config.py2
-rw-r--r--config/win32-mingw-config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 1ae042d5b7b..8060b6d27a3 100644
--- 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 319c9b264f2..f44f6a247b9 100644
--- 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'