diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-11-16 16:18:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-11-16 16:18:47 +0400 |
| commit | 88b26f24e42c5e6427d9709a3332ad903cb9d7c4 (patch) | |
| tree | 16450d3369e0f3e6be594c20d4d19f3c15f2997f /build_files | |
| parent | 3edbd1d0e2b8b09af60cec4e058b795fc0c2a1f7 (diff) | |
Windows x64:
* Fix compile after recent OIIO changes.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 8d49e178ddb..86b9984b7e3 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -164,14 +164,12 @@ BF_OIIO = '${LIBDIR}/openimageio' BF_OIIO_INC = '${BF_OIIO}/include' BF_OIIO_LIB = 'OpenImageIO' BF_OIIO_LIBPATH = '${BF_OIIO}/lib' -BF_OIIO_LIBPATH = '${BF_OIIO}/lib' WITH_BF_OCIO = True BF_OCIO = '${LIBDIR}/opencolorio' BF_OCIO_INC = '${BF_OCIO}/include' BF_OCIO_LIB = 'OpenColorIO' BF_OCIO_LIBPATH = '${BF_OCIO}/lib' -BF_OCIO_LIBPATH = '${BF_OCIO}/lib' WITH_BF_BOOST = True BF_BOOST = '${LIBDIR}/boost' @@ -216,7 +214,7 @@ C_WARN = [] CC_WARN = [] CXX_WARN = [] -LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid'] +LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid', 'psapi'] PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib'] |