Windows OIIO:

* bin/OpenImageIO.dll not needed anymore, now statically linked.
This commit is contained in:
Thomas Dinges
2012-11-15 19:37:29 +00:00
parent 2007ba687f
commit 17e506a83e
2 changed files with 1 additions and 17 deletions

View File

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

View File

@@ -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)