Enable OpenColorIO for MinGW64 build targets

diff --git a/SConstruct b/SConstruct
index 517f507ec61275efa40da7491b725e06082083fe..7676b44f75945f9b8d0520a59f7de9bb4a4427a9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -871,9 +871,13 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
         dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
 
-    if env['WITH_BF_OCIO'] and env['OURPLATFORM'] != 'win32-mingw':
-        dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')
+    if env['WITH_BF_OCIO']:
+        if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
+            dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')
 
+        else:
+            dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
+                       
     dllsources.append('#source/icons/blender.exe.manifest')
 
     windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -903,6 +907,9 @@ if env['OURPLATFORM'] == 'win64-mingw':
 
     if(env['WITH_BF_OPENMP']):
         dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+               
+    if env['WITH_BF_OCIO']:
+        dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
 
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
     dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')

diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index c2bf2df6d00836e5b14725ecafbdabdd306ea398..020e5ad3a610dfa7a212149ccf89d8c74d65ceea 100644 (file)
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-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'

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 3356091b97f951842d5eeac4d3816daabe843e65..4a460d7cc05e6d646cb8e7116499011fa26d6b2e 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -646,13 +646,19 @@ elseif(WIN32)
        endif()
 
        if(WITH_OPENCOLORIO)
+               set_lib_path(OCIOBIN "opencolorio/bin")
                if(NOT MINGW)
-                       set_lib_path(OCIOBIN "opencolorio/bin")
                        install(
                                FILES
                                        ${OCIOBIN}/OpenColorIO.dll
                                DESTINATION ${TARGETDIR}
                        )
+               else()
+                       install(
+                               FILES
+                                       ${OCIOBIN}/libOpenColorIO.dll
+                               DESTINATION ${TARGETDIR}
+                       )
                endif()
        endif()