forked from bartvdbraak/blender
[depsbuilder] fix outdated python patch on windows.
This commit is contained in:
parent
30e0100813
commit
e79db3b2f8
@ -1,6 +1,18 @@
|
||||
--- _msvccompiler.py 2016-08-12 10:44:32 -0600
|
||||
+++ _msvccompiler.py 2016-08-12 10:47:29 -0600
|
||||
@@ -246,8 +246,8 @@
|
||||
--- _msvccompiler.py.orig 2017-05-20 19:31:45 -0600
|
||||
+++ _msvccompiler.py 2017-06-10 10:05:38 -0600
|
||||
@@ -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 = [
|
||||
'/nologo', '/INCREMENTAL:NO', '/LTCG'
|
||||
]
|
||||
@ -10,4 +22,8 @@
|
||||
+ # ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
|
||||
|
||||
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']
|
||||
|
Loading…
Reference in New Issue
Block a user