[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37573] trunk/blender/build_files/scons/ config: Fix [#27666] Python/Windows issue: "import uuid" results in an error popup

[Nathan Letwory]

Revision: 37573
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37573
Author:   jesterking
Date:     2011-06-17 00:30:04 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Fix [#27666] Python/Windows issue: "import uuid" results in an error popup
submitted by Gaia Clary

Ignore msvc runtime libs while linking. Tested on win64.

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

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py   2011-06-16 
22:29:04 UTC (rev 37572)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py   2011-06-17 
00:30:04 UTC (rev 37573)
@@ -181,7 +181,7 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 
'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-PLATFORM_LINKFLAGS = 
['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', 
'/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = 
['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', 
'/LARGEADDRESSAWARE', '/NODEFAULTLIB:"msvcrt.lib"', 
'/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', 
'/NODEFAULTLIB:"msvcrtd.lib"']
 
 # # Todo
 # BF_PROFILE_CCFLAGS = ['-pg', '-g ']

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py   2011-06-16 
22:29:04 UTC (rev 37572)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py   2011-06-17 
00:30:04 UTC (rev 37573)
@@ -188,7 +188,7 @@
 else:
        BF_NUMJOBS=6
 
-PLATFORM_LINKFLAGS = 
['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO']
+PLATFORM_LINKFLAGS = 
['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO',
 '/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', 
'/NODEFAULTLIB:"msvcurt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"']
 
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'
 BF_INSTALLDIR='..\\install\\blender25-win64-vc'

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs