Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[depsbuilder] fix outdated python patch on windows.

Browse Source
This commit is contained in:
Ray Molenkamp
2017-08-14 15:11:44 -06:00
parent 30e0100813
commit e79db3b2f8
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build_files/build_environment/patches/python_runtime_vc2013.diff
View File

@@ -1,6 +1,18 @@
--- _msvccompiler.py 2016-08-12 10:44:32 -0600 --- _msvccompiler.py.orig 2017-05-20 19:31:45 -0600
+++ _msvccompiler.py 2016-08-12 10:47:29 -0600 +++ _msvccompiler.py 2017-06-10 10:05:38 -0600
@@ -246,8 +246,8 @@ @@ -222,9 +222,9 @@
# use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
# later to dynamically link to ucrtbase but not vcruntime.
self.compile_options = [
- '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
+ '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG' , '/MD'
]
- self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
+ #self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
self.compile_options_debug = [
'/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
@@ -233,11 +233,11 @@
ldflags = [ ldflags = [
'/nologo', '/INCREMENTAL:NO', '/LTCG' '/nologo', '/INCREMENTAL:NO', '/LTCG'
] ]
@@ -10,4 +22,8 @@
+ # ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib')) + # ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
ldflags_debug = [ ldflags_debug = [
'/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL' - '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
+ '/nologo', '/INCREMENTAL:NO', '/LTCG'
]
self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']