mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 69489-69490 via svnmerge from

Browse source 
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
........
This commit is contained in:
Martin v. Löwis 2009-02-10 13:17:53 +00:00
parent 436eb08ca7
commit a2a21eed02
3 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -334,6 +334,8 @@ Tools/Demos
Build Build
----- -----
- Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
- Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows. - Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.
- Issue #4895: Use _strdup on Windows CE. - Issue #4895: Use _strdup on Windows CE.

40
PCbuild/sqlite3.vcproj
View file

@ -22,7 +22,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
@ -42,8 +42,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -83,7 +82,7 @@
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
@ -104,8 +103,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -145,7 +143,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops" InheritedPropertySheets=".\sqlite3.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -166,8 +164,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -207,7 +204,7 @@
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -229,8 +226,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -270,7 +266,7 @@
<Configuration <Configuration
Name="PGInstrument|Win32" Name="PGInstrument|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -291,8 +287,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories="&quot;$(sqlite3Dir)&quot;"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -332,7 +327,7 @@
<Configuration <Configuration
Name="PGInstrument|x64" Name="PGInstrument|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -354,8 +349,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -394,7 +388,7 @@
<Configuration <Configuration
Name="PGUpdate|Win32" Name="PGUpdate|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -415,8 +409,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -456,7 +449,7 @@
<Configuration <Configuration
Name="PGUpdate|x64" Name="PGUpdate|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" InheritedPropertySheets=".\x64.vsprops;.\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -478,8 +471,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

14
PCbuild/sqlite3.vsprops Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="sqlite3"
InheritedPropertySheets=".\pyproject.vsprops"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
WarningLevel="1"
/>
</VisualStudioPropertySheet>