From 0895747b41b38da407efb480899c9ba86ec6226a Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Sun, 7 Jun 2009 19:51:52 +0000 Subject: Bugfix: WITH_BF_OPENMP=0 wasn't respected anymore, removed LARGEADRESSAWARE (does make no sense on 64bit) --- config/win64-vc-config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 172fb286fc8..fcc6f1ab846 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -182,7 +182,7 @@ WITH_BF_DOCS=False BF_DEBUG=False BF_BSC=False CFLAGS = [] -CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/openmp'] +CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT'] CXXFLAGS = ['/EHsc'] if BF_DEBUG: @@ -190,7 +190,7 @@ if BF_DEBUG: else: BF_NUMJOBS=6 -PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE'] +PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"'] BF_BUILDDIR = '..\\build\\blender25-win64-vc' BF_INSTALLDIR='..\\install\\blender25-win64-vc' -- cgit v1.2.3