diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-09-17 00:26:28 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-09-17 00:26:28 +0400 |
commit | 3968b637353dc697c94ab6be85e00d108bebd72e (patch) | |
tree | 4b6bba61f144fbaf9104f52a12582b3adf2d7e7e | |
parent | b1d1355f308d7fd1042fcb26a77f028de4887050 (diff) |
* Enable opencolorio for scons/mingw32 (coming very soon)
* Change names of libraries for mingw32 boost to 1.49
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2de280c630b..b11a6525549 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1245,8 +1245,8 @@ elseif(WIN32) set(BOOST_POSTFIX "mgw47-mt-s-1_49") set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49") else() - set(BOOST_POSTFIX "mgw46-mt-s-1_47") - set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47") + set(BOOST_POSTFIX "mgw46-mt-s-1_49") + set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49") endif() set(BOOST_LIBRARIES optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX} diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 95b2329f426..cc31bace6b4 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -159,7 +159,7 @@ BF_OIIO_INC = BF_OIIO + '/include' BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIBPATH = BF_OIIO + '/lib' -WITH_BF_OCIO = False +WITH_BF_OCIO = True BF_OCIO = LIBDIR + '/opencolorio' BF_OCIO_INC = BF_OCIO + '/include' BF_OCIO_LIB = 'OpenColorIO' |