diff options
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 13 |
2 files changed, 1 insertions, 17 deletions
diff --git a/SConstruct b/SConstruct index bda361a0a9d..0bbe06eb21e 100644 --- a/SConstruct +++ b/SConstruct @@ -886,11 +886,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll') dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll') - if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw': - dllpath = '${LCGDIR}/openimageio/bin/OpenImageIO.dll' - if os.path.exists(env.subst(dllpath)): - dllsources.append(dllpath) - if env['WITH_BF_OCIO']: if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'): dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4d1620a8bb8..66c3beeebad 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -618,18 +618,7 @@ elseif(WIN32) install( # x86 builds can run on x64 Windows, so this is required at all times FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll DESTINATION ${TARGETDIR} - ) - - if(WITH_OPENIMAGEIO) - set(OIIODLL ${LIBDIR}/openimageio/bin/OpenImageIO.dll) - if(NOT MINGW AND EXISTS ${OIIODLL}) - install( - FILES - ${OIIODLL} - DESTINATION ${TARGETDIR} - ) - endif() - endif() + ) if(WITH_OPENCOLORIO) set(OCIOBIN ${LIBDIR}/opencolorio/bin) |