[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42960] trunk/blender/build_files/scons/ config/win32-mingw-config.py: Mingw - use truly relative instead of absolute-relative paths for Boost and OIIO
Joshua Leung
aligorith at gmail.com
Thu Dec 29 03:57:42 CET 2011
Revision: 42960
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42960
Author: aligorith
Date: 2011-12-29 02:57:41 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/win32-mingw-config.py
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2011-12-29 02:55:20 UTC (rev 42959)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2011-12-29 02:57:41 UTC (rev 42960)
@@ -156,15 +156,15 @@
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
More information about the Bf-blender-cvs
mailing list