From fc74eea7a46bbdae6b928560c6a4378a5826e185 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 29 Dec 2011 02:57:41 +0000 Subject: [PATCH] Mingw - use truly relative instead of absolute-relative paths for Boost and OIIO That is, instead of '#../lib/windows/lib_name/include', we're now using BF_LIBNAME + '/include'. This makes it possible to have a single lib folder shared between several local working trees again. --- build_files/scons/config/win32-mingw-config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index d9fafbda5b0..e4f8827b7c8 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -156,15 +156,15 @@ WITH_BF_CYCLES = True WITH_BF_OIIO = True BF_OIIO = LIBDIR + '/gcc/openimageio' -BF_OIIO_INC = '#../lib/windows/gcc/openimageio/include' +BF_OIIO_INC = BF_OIIO + '/include' BF_OIIO_LIB = 'OpenImageIO' -BF_OIIO_LIBPATH = '#../lib/windows/gcc/openimageio/lib' +BF_OIIO_LIBPATH = BF_OIIO + '/lib' WITH_BF_BOOST = True BF_BOOST = LIBDIR + '/boost' -BF_BOOST_INC = '#../lib/windows/boost/include' +BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_LIB = 'boost_date_time-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47' -BF_BOOST_LIBPATH = '#../lib/windows/boost/lib/gcc' +BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True