diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
| commit | 3bca9f5fed1f6d3dd485e3cff2174c3394bb1162 (patch) | |
| tree | 7083a56f6b8db22ad51a6319f7281cb4d7124c12 /build_files/build_environment/patches/python_runtime_vc2013.diff | |
| parent | 3311505fd07310a6bfac79ce787dbd394002dd1f (diff) | |
| parent | f20d7bed1426ca3d1268182835f04e7ab8212cac (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/makesrna/intern/rna_render.c
Diffstat (limited to 'build_files/build_environment/patches/python_runtime_vc2013.diff')
| -rw-r--r-- | build_files/build_environment/patches/python_runtime_vc2013.diff | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/build_files/build_environment/patches/python_runtime_vc2013.diff b/build_files/build_environment/patches/python_runtime_vc2013.diff index 8177f735c92..186d2b36c07 100644 --- a/build_files/build_environment/patches/python_runtime_vc2013.diff +++ b/build_files/build_environment/patches/python_runtime_vc2013.diff @@ -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'] |