Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Enable opencolorio for scons/mingw32 (coming very soon)

Browse Source 
* Change names of libraries for mingw32 boost to 1.49
This commit is contained in:
Antony Riakiotakis
2012-09-16 20:26:28 +00:00
parent b1d1355f30
commit 3968b63735
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1245,8 +1245,8 @@ elseif(WIN32)
set(BOOST_POSTFIX "mgw47-mt-s-1_49") set(BOOST_POSTFIX "mgw47-mt-s-1_49")
set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49") set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
else() else()
set(BOOST_POSTFIX "mgw46-mt-s-1_47") set(BOOST_POSTFIX "mgw46-mt-s-1_49")
set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47") set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49")
endif() endif()
set(BOOST_LIBRARIES set(BOOST_LIBRARIES
optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX} optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}

2
build_files/scons/config/win32-mingw-config.py
View File

@@ -159,7 +159,7 @@ BF_OIIO_INC = BF_OIIO + '/include'
BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = BF_OIIO + '/lib' BF_OIIO_LIBPATH = BF_OIIO + '/lib'
WITH_BF_OCIO = False WITH_BF_OCIO = True
BF_OCIO = LIBDIR + '/opencolorio' BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = BF_OCIO + '/include' BF_OCIO_INC = BF_OCIO + '/include'
BF_OCIO_LIB = 'OpenColorIO' BF_OCIO_LIB = 'OpenColorIO'