[Bf-blender-cvs] [e79db3b2f82] master: [depsbuilder] fix outdated python patch on windows.

Ray Molenkamp noreply at git.blender.org
Mon Aug 14 23:21:58 CEST 2017


Commit: e79db3b2f8284bd29d0ad8fa445095bec6d33d92
Author: Ray Molenkamp
Date:   Mon Aug 14 15:11:44 2017 -0600
Branches: master
https://developer.blender.org/rBe79db3b2f8284bd29d0ad8fa445095bec6d33d92

[depsbuilder] fix outdated python patch on windows.

===================================================================

M	build_files/build_environment/patches/python_runtime_vc2013.diff

===================================================================

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']




More information about the Bf-blender-cvs mailing list