From 999f312d6250ce3fd76dd59465be4fc25d0a612f Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 12 Nov 2008 07:48:53 +0000 Subject: Change the LCG_DIR usage to BF_name_LIBPATH where possible. FFMPEG can't be done like that yet, needs some extra thought to handle differences between vc and mingw setup --- config/win32-mingw-config.py | 2 ++ config/win32-vc-config.py | 2 ++ 2 files changed, 4 insertions(+) (limited to 'config') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 15bfce80f89..712ec90189a 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -64,6 +64,8 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 9a41f7ee557..fe51abe0a89 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -77,6 +77,8 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' -- cgit v1.2.3 From 3fd3a13efc81ce3eafadd5ab31a154bbc25d6e58 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 12 Nov 2008 16:04:14 +0000 Subject: set default path to the version that creates a working binary of Blender, when building with mingw. Now there is no need to do extra copying/config changing --- config/win32-mingw-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 712ec90189a..22666851f28 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -9,7 +9,7 @@ BF_PYTHON_VERSION = '2.5' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' -BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' +BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False -- cgit v1.2.3