diff options
| author | Jeremy Kloth <jeremy.kloth@gmail.com> | 2017-06-21 13:14:53 -0600 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-06-21 21:14:53 +0200 |
| commit | ab3b0ade505ce07a3d5ec4fbc991a154242732e6 (patch) | |
| tree | 3d347e4120a8e46a85065524370d6d96d3f26264 /PC | |
| parent | 2ada64d2a073f85f135461833952dbe8d656810d (diff) | |
| download | cpython-git-ab3b0ade505ce07a3d5ec4fbc991a154242732e6.tar.gz | |
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.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VS9.0/_elementtree.vcproj | 16 | ||||
| -rw-r--r-- | PC/VS9.0/pyexpat.vcproj | 16 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/PC/VS9.0/_elementtree.vcproj b/PC/VS9.0/_elementtree.vcproj index feb96ebe0f..5e79955767 100644 --- a/PC/VS9.0/_elementtree.vcproj +++ b/PC/VS9.0/_elementtree.vcproj @@ -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" diff --git a/PC/VS9.0/pyexpat.vcproj b/PC/VS9.0/pyexpat.vcproj index 7b09076cdd..32ec10dd7a 100644 --- a/PC/VS9.0/pyexpat.vcproj +++ b/PC/VS9.0/pyexpat.vcproj @@ -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" diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index c97396018d..44b4f5317e 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -12,7 +12,7 @@ InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\Include; ..\..\PC" - PreprocessorDefinitions="_WIN32" + PreprocessorDefinitions="_WIN32;WIN32" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="0" |