# HG changeset patch
# User Todd Tomashek <todd.m.tomashek@intel.com>
# Date 1440538648 18000
#      Tue Aug 25 16:37:28 2015 -0500
# Branch 2.7
# Node ID f58b133ffd8173d5b236b3b5d8a6589cb7e44f8e
# Parent  da483bda6efc040578bb4222391973bd71cbe4b2
Added CFLAGS environment variable to compilation Additional Options

diff -r da483bda6efc -r f58b133ffd81 PC/bdist_wininst/bdist_wininst.vcxproj
--- a/PC/bdist_wininst/bdist_wininst.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PC/bdist_wininst/bdist_wininst.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -70,6 +70,7 @@
       <Optimization>MinSpace</Optimization>
       <AdditionalIncludeDirectories>$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_bsddb.vcxproj
--- a/PCbuild/_bsddb.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_bsddb.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -64,6 +64,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(bsddbDir)\build_windows;$(bsddbDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_ctypes.vcxproj
--- a/PCbuild/_ctypes.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_ctypes.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -62,6 +62,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <BaseAddress>0x1D1A0000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_ctypes_test.vcxproj
--- a/PCbuild/_ctypes_test.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_ctypes_test.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\Modules\_ctypes\_ctypes_test.h" />
   </ItemGroup>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_elementtree.vcxproj
--- a/PCbuild/_elementtree.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_elementtree.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -63,6 +63,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <BaseAddress>0x1D100000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_hashlib.vcxproj
--- a/PCbuild/_hashlib.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_hashlib.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -62,6 +62,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_msi.vcxproj
--- a/PCbuild/_msi.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_msi.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D160000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_multiprocessing.vcxproj
--- a/PCbuild/_multiprocessing.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_multiprocessing.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1e1D0000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_socket.vcxproj
--- a/PCbuild/_socket.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_socket.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1e1D0000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_sqlite3.vcxproj
--- a/PCbuild/_sqlite3.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_sqlite3.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -63,6 +63,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MODULE_NAME="sqlite3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <BaseAddress>0x1e180000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_ssl.vcxproj
--- a/PCbuild/_ssl.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_ssl.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -62,6 +62,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_testcapi.vcxproj
--- a/PCbuild/_testcapi.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_testcapi.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -61,6 +61,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <BaseAddress>0x1e1F0000</BaseAddress>
     </Link>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/_tkinter.vcxproj
--- a/PCbuild/_tkinter.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/_tkinter.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -63,6 +63,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(tcltkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WITH_APPINIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(tcltkLib);%(AdditionalDependencies)</AdditionalDependencies>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/bz2.vcxproj
--- a/PCbuild/bz2.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/bz2.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -64,7 +64,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(bz2Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <BaseAddress>0x1D170000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/libeay.vcxproj
--- a/PCbuild/libeay.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/libeay.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -74,6 +74,11 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
 
   <ItemGroup>
     <!--
diff -r da483bda6efc -r f58b133ffd81 PCbuild/pyexpat.vcxproj
--- a/PCbuild/pyexpat.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/pyexpat.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/python.vcxproj
--- a/PCbuild/python.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/python.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -59,6 +59,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/pythoncore.vcxproj
--- a/PCbuild/pythoncore.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/pythoncore.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -65,7 +65,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalOptions>/Zm200  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zm200 $(CFLAGS)  %(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>$(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/pythonw.vcxproj
--- a/PCbuild/pythonw.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/pythonw.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -57,6 +57,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <StackReserveSize>2000000</StackReserveSize>
       <BaseAddress>0x1d000000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/select.vcxproj
--- a/PCbuild/select.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/select.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -59,6 +59,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <BaseAddress>0x1D110000</BaseAddress>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/sqlite3.vcxproj
--- a/PCbuild/sqlite3.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/sqlite3.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -62,6 +62,7 @@
       <AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level1</WarningLevel>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/ssleay.vcxproj
--- a/PCbuild/ssleay.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/ssleay.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -48,7 +48,11 @@
 
   <Import Project="openssl.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <!--
     <ClCompile Include="$(opensslDir)ssl\bio_ssl.c" />
diff -r da483bda6efc -r f58b133ffd81 PCbuild/unicodedata.vcxproj
--- a/PCbuild/unicodedata.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/unicodedata.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <BaseAddress>0x1D120000</BaseAddress>
     </Link>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/w9xpopen.vcxproj
--- a/PCbuild/w9xpopen.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/w9xpopen.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -63,6 +63,7 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff -r da483bda6efc -r f58b133ffd81 PCbuild/winsound.vcxproj
--- a/PCbuild/winsound.vcxproj	Mon Aug 24 16:17:13 2015 -0400
+++ b/PCbuild/winsound.vcxproj	Tue Aug 25 16:37:28 2015 -0500
@@ -60,6 +60,9 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>$(CFLAGS) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>