]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ada64d)
bpo-29591: Update VS project files (#2310)
authorJeremy Kloth <jeremy.kloth@gmail.com>
Wed, 21 Jun 2017 19:14:53 +0000 (13:14 -0600)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 21 Jun 2017 19:14:53 +0000 (21:14 +0200)
* Silence warnings caused by duplicated defines from Modules\expat\winconfig.h
* Add WIN32 define to VS9.0 project files to match MSBuild project files.

PC/VS9.0/_elementtree.vcproj patch | blob | history
PC/VS9.0/pyexpat.vcproj patch | blob | history
PC/VS9.0/pyproject.vsprops patch | blob | history
PCbuild/_elementtree.vcxproj patch | blob | history
PCbuild/pyexpat.vcxproj patch | blob | history

diff --git a/PC/VS9.0/_elementtree.vcproj b/PC/VS9.0/_elementtree.vcproj
index feb96ebe0ff57efc024e629b8d8f19ef15891577..5e799557679fd8a346791517f8beb90e5acb34e7 100644 (file)
--- 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 7b09076cddffb4d567845ede3e20f128087c235c..32ec10dd7a8ec277ae92bafb4735b407d173c8af 100644 (file)
--- 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 c97396018d2efdeaa247b5148c99178bf6f3d28f..44b4f5317ed176cfa7810219a3028ad9e00ea4cc 100644 (file)
--- 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"
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 1ce1a0450eb4e3287c211b0d76eae264a0f56579..3a271ef593121e5d5b7e2aecce3db500993d8d41 100644 (file)
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -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>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index a319ff9803a52ae51f5561ec5fceaa1927d08f26..6d036d13dab908616faf2c1d01b27256f1aa0da3 100644 (file)
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -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>
Unnamed repository; edit this file 'description' to name the repository.