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)
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')
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'
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()