Updated VS8.0 project files with PCBuild/vs9to8.py.

diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj
index f3d0565bc91b1745675c7ca238cf385bada6ad22..c2bbec449d64c20254b97db12975bdb4ae83545a 100644 (file)
--- a/PC/VS8.0/_multiprocessing.vcproj
+++ b/PC/VS8.0/_multiprocessing.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_multiprocessing"\r
-       ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}"\r
+       ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"\r
        RootNamespace="_multiprocessing"\r
        Keyword="Win32Proj"\r
        TargetFrameworkVersion="196613"\r

diff --git a/PC/VS8.0/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj
index cbd02cc3efa3a567ddc95cf7f30b58a282ca5b18..d9e89c73ce26550d43be0a900cc2f74301607cfc 100644 (file)
--- a/PC/VS8.0/_sqlite3.vcproj
+++ b/PC/VS8.0/_sqlite3.vcproj
@@ -42,7 +42,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -104,7 +104,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -166,7 +166,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -229,7 +229,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -291,7 +291,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -354,7 +354,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -417,7 +417,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool
@@ -480,7 +480,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+                               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
                        />
                        <Tool

diff --git a/PC/VS8.0/bdist_wininst.vcproj b/PC/VS8.0/bdist_wininst.vcproj
index a0de04a79ded720a12bbaaeeda1c7a2ea6e2cdb5..0bd2ee6de01c28efc4b910a7a2c06b114b0c8c43 100644 (file)
--- a/PC/VS8.0/bdist_wininst.vcproj
+++ b/PC/VS8.0/bdist_wininst.vcproj
@@ -55,7 +55,7 @@
                                AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -145,7 +145,7 @@
                                AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
                                WarningLevel="3"
                                SuppressStartupBanner="true"

diff --git a/PC/VS8.0/bz2.vcproj b/PC/VS8.0/bz2.vcproj
index 8382818dd252fa50b88413eb3374e3d06525a766..fead64087ce7c47819a3cba70605538cc6b69ffd 100644 (file)
--- a/PC/VS8.0/bz2.vcproj
+++ b/PC/VS8.0/bz2.vcproj
@@ -43,6 +43,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -52,12 +53,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -106,6 +105,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -115,12 +115,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -169,6 +167,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -178,12 +177,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -233,6 +230,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -242,12 +240,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -296,6 +292,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -305,12 +302,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -360,6 +355,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -369,12 +365,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                                TargetMachine="17"
                        />
                        <Tool
@@ -424,6 +418,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -433,12 +428,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -488,6 +481,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -497,12 +491,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                                TargetMachine="17"
                        />
                        <Tool
@@ -539,6 +531,50 @@
                                >
                        </File>
                </Filter>
+               <Filter
+                       Name="bzip2 1.0.5 Header Files"
+                       >
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib_private.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="bzip2 1.0.5 Source Files"
+                       >
+                       <File
+                               RelativePath="$(bz2Dir)\blocksort.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\compress.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\crctable.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\decompress.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\huffman.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\randtable.c"
+                               >
+                       </File>
+               </Filter>
        </Files>
        <Globals>
        </Globals>

diff --git a/PC/VS8.0/pyd.vsprops b/PC/VS8.0/pyd.vsprops
index bfe6bd7e2d4c36474fe8f1f4f3962aa21502702d..e38b9615a2375acfe7d8d5301d814a4a940b05be 100644 (file)
--- a/PC/VS8.0/pyd.vsprops
+++ b/PC/VS8.0/pyd.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
+\r
 <VisualStudioPropertySheet\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
@@ -15,6 +15,11 @@
                OutputFile="$(OutDir)\$(ProjectName).pyd"\r
                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+               GenerateManifest="false"\r
+       />\r
+       <Tool\r
+               Name="VCManifestTool"\r
+               EmbedManifest="false"\r
        />\r
        <Tool\r
                Name="VCPostBuildEventTool"\r

diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops
index f3a951c53f542028d845543ec8f362a12f8cb14c..313a30b782fd555f1fbf4f3c37be9fb87fd2e206 100644 (file)
--- a/PC/VS8.0/pyd_d.vsprops
+++ b/PC/VS8.0/pyd_d.vsprops
@@ -19,6 +19,11 @@
                LinkIncremental="1"\r
                ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"\r
                ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+               GenerateManifest="false"\r
+       />\r
+       <Tool\r
+               Name="VCManifestTool"\r
+               EmbedManifest="false"\r
        />\r
        <Tool\r
                Name="VCPostBuildEventTool"\r

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 44f2a24b2452fa5c9061fb77353cbd788c428f7c..2692b89b0da58ffcf774ae744a70f8f1db0025ef 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -48,6 +48,14 @@
                Name="externalsDir"\r
                Value="..\..\.."\r
        />\r
+       <UserMacro\r
+               Name="bsddb47Dir"\r
+               Value="$(externalsDir)\db-4.7.25.0\build_windows"\r
+       />\r
+       <UserMacro\r
+               Name="bsddb47DepLibs"\r
+               Value="ws2_32.lib"\r
+       />\r
        <UserMacro\r
                Name="bsddbDir"\r
                Value="$(bsddb47Dir)"\r
@@ -64,17 +72,9 @@
                Name="bsddb44DepLibs"\r
                Value=""\r
        />\r
-       <UserMacro\r
-               Name="bsddb47Dir"\r
-               Value="$(externalsDir)\db-4.7.25.0\build_windows"\r
-       />\r
-       <UserMacro\r
-               Name="bsddb47DepLibs"\r
-               Value="ws2_32.lib"\r
-       />\r
        <UserMacro\r
                Name="sqlite3Dir"\r
-               Value="$(externalsDir)\sqlite-3.5.9"\r
+               Value="$(externalsDir)\sqlite-3.6.21"\r
        />\r
        <UserMacro\r
                Name="bz2Dir"\r
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-0.9.8g"\r
+               Value="$(externalsDir)\openssl-0.9.8l"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index ba8b62664b5c21f856593e02c9c55b5cb54200c6..38f41df136555f86b7c865421ed21a329484b4c4 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1418,10 +1418,6 @@
                                RelativePath="..\..\Objects\bytearrayobject.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Objects\stringobject.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Objects\capsule.c"
                                >
@@ -1550,6 +1546,10 @@
                                RelativePath="..\..\Objects\stringlib\split.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\Objects\stringobject.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\Objects\structseq.c"
                                >

diff --git a/PC/VS8.0/sqlite3.vcproj b/PC/VS8.0/sqlite3.vcproj
index 071589a7ff28c485dcca004265635a45280ae8cc..e7e072880c63bb9bd3b237883d4eae6aaf90714f 100644 (file)
--- a/PC/VS8.0/sqlite3.vcproj
+++ b/PC/VS8.0/sqlite3.vcproj
@@ -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="..\..\..\sqlite-3.5.9"
-                               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=".\sqlite3.vsprops;.\debug.vsprops;.\x64.vsprops"
                        CharacterSet="0"
                        >
                        <Tool
@@ -104,8 +103,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-                               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="..\..\..\sqlite-3.5.9"
-                               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=".\sqlite3.vsprops;.\x64.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -229,8 +226,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-                               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="..\..\..\sqlite-3.5.9"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories="&quot;..\..\..\sqlite-3.6.21&quot;"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -332,7 +327,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -354,8 +349,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-                               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="..\..\..\sqlite-3.5.9"
-                               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=".\sqlite3.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -478,8 +471,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+                               AdditionalIncludeDirectories=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -523,11 +515,11 @@
                        Name="Header Files"
                        >
                        <File
-                               RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h"
+                               RelativePath="..\..\..\sqlite-3.6.21\sqlite3.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h"
+                               RelativePath="..\..\..\sqlite-3.6.21\sqlite3ext.h"
                                >
                        </File>
                </Filter>
@@ -535,7 +527,7 @@
                        Name="Source Files"
                        >
                        <File
-                               RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c"
+                               RelativePath="..\..\..\sqlite-3.6.21\sqlite3.c"
                                >
                        </File>
                </Filter>

diff --git a/PC/VS8.0/sqlite3.vsprops b/PC/VS8.0/sqlite3.vsprops
new file mode 100644 (file)
index 0000000..8300328
--- /dev/null
+++ b/PC/VS8.0/sqlite3.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="sqlite3"\r
+       InheritedPropertySheets=".\pyproject.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"\r
+               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
+               WarningLevel="1"\r
+       />\r
+</VisualStudioPropertySheet>\r