[Python-checkins] r69493 - in python/branches/release26-maint: Misc/NEWS PCbuild/sqlite3.vcproj PCbuild/sqlite3.vsprops
martin.v.loewis
python-checkins at python.org
Tue Feb 10 14:17:53 CET 2009
Author: martin.v.loewis
Date: Tue Feb 10 14:17:53 2009
New Revision: 69493
Log:
Merged revisions 69489-69490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69489 | martin.v.loewis | 2009-02-10 14:09:19 +0100 (Di, 10 Feb 2009) | 1 line
Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
........
r69490 | martin.v.loewis | 2009-02-10 14:12:12 +0100 (Di, 10 Feb 2009) | 1 line
Set eol-style to native
........
Added:
python/branches/release26-maint/PCbuild/sqlite3.vsprops
- copied unchanged from r69490, /python/trunk/PCbuild/sqlite3.vsprops
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/PCbuild/sqlite3.vcproj
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Tue Feb 10 14:17:53 2009
@@ -334,6 +334,8 @@
Build
-----
+- Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
+
- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.
- Issue #4895: Use _strdup on Windows CE.
Modified: python/branches/release26-maint/PCbuild/sqlite3.vcproj
==============================================================================
--- python/branches/release26-maint/PCbuild/sqlite3.vcproj (original)
+++ python/branches/release26-maint/PCbuild/sqlite3.vcproj Tue Feb 10 14:17:53 2009
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd_d.vsprops"
+ InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0"
>
<Tool
@@ -42,8 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -83,7 +82,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0"
>
<Tool
@@ -104,8 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,7 +143,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops"
+ InheritedPropertySheets=".\sqlite3.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -166,8 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -207,7 +204,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -229,8 +226,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -270,7 +266,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -291,8 +287,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""$(sqlite3Dir)""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -332,7 +327,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -354,8 +349,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -394,7 +388,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -415,8 +409,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -456,7 +449,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -478,8 +471,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
- PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+ AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
More information about the Python-checkins
mailing list