[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52270] trunk/blender/build_files/scons/ config/win64-vc-config.py: Windows x64:

[Thomas Dinges]

Revision: 52270
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52270
Author:   dingto
Date:     2012-11-16 12:18:47 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Windows x64:
* Fix compile after recent OIIO changes. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-16 10:15:25 UTC (rev 52269)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-16 12:18:47 UTC (rev 52270)
@@ -164,14 +164,12 @@
 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 @@
 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']