diff options
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 517f507ec61..7676b44f759 100644 --- 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') |