diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-12-29 06:57:41 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-12-29 06:57:41 +0400 |
| commit | fc74eea7a46bbdae6b928560c6a4378a5826e185 (patch) | |
| tree | aa662da65a031ea6f32dad9f3ef52812554be789 /build_files | |
| parent | 85a97f64a7cbc5f17594a22ce1431520d2ff4d59 (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 8 |
1 files 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 |