diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-15 21:16:27 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-15 21:16:27 +0400 |
| commit | 2324c80f50f9cb95435b66ea370d38fd9617760b (patch) | |
| tree | e9fe125c911541a232ba868c138f8f44531af97c /SConstruct | |
| parent | 1c9b548d92e8a76ac0a3c730bff5634d4628e971 (diff) | |
Cycles OSL: windows build system changes to support static OSL/OIIO.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 5e31fce00a4..bda361a0a9d 100644 --- a/SConstruct +++ b/SConstruct @@ -887,7 +887,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll') if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw': - dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll') + 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'): |