traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-29591: Update VS project files (#2310) 

* Silence warnings caused by duplicated defines from Modules\expat\winconfig.h
* Add WIN32 define to VS9.0 project files to match MSBuild project files.
This commit is contained in:
Jeremy Kloth 2017-06-21 13:14:53 -06:00 committed by Victor Stinner
parent 2ada64d2a0
commit ab3b0ade50
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PC/VS9.0/_elementtree.vcproj
View File

@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -105,7 +105,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -167,7 +167,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -230,7 +230,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -292,7 +292,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -355,7 +355,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -418,7 +418,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -481,7 +481,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"

16
PC/VS9.0/pyexpat.vcproj
View File

@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -104,7 +104,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -165,7 +165,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -227,7 +227,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -288,7 +288,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -350,7 +350,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -412,7 +412,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -474,7 +474,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
PC/VS9.0/pyproject.vsprops
View File

@ -12,7 +12,7 @@
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
PreprocessorDefinitions="_WIN32"
PreprocessorDefinitions="_WIN32;WIN32"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"

2
PCbuild/_elementtree.vcxproj
View File

@ -62,7 +62,7 @@
<ItemDefinitionGroup>
<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>
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<BaseAddress>0x1D100000</BaseAddress>

2
PCbuild/pyexpat.vcxproj
View File

@ -59,7 +59,7 @@
<ItemDefinitionGroup>
<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>
<PreprocessorDefinitions>PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>