Kaydet (Commit) cb87f82f authored tarafından Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

Merged revisions 66166 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

Note: The Windows projects still use bsddb 4.4.20 on the py3k branch

........
  r66166 | amaury.forgeotdarc | 2008-09-02 23:17:05 +0200 (mar., 02 sept. 2008) | 2 lines

  Use vs9to8.py to refresh the Visual Studio 2005 build files.
........
üst 7aa42ea1
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="ml64 /nologo /c /Zi /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\win64.obj" Outputs="$(IntDir)\win64.obj"
/> />
</FileConfiguration> </FileConfiguration>
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="_multiprocessing" Name="_multiprocessing"
ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}" ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
RootNamespace="_multiprocessing" RootNamespace="_multiprocessing"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -75,15 +74,19 @@ ...@@ -75,15 +74,19 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" InheritedPropertySheets=".\pyd.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -99,7 +102,6 @@ ...@@ -99,7 +102,6 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -136,14 +138,17 @@ ...@@ -136,14 +138,17 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="PGInstrument|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops" InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -197,14 +202,17 @@ ...@@ -197,14 +202,17 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="PGUpdate|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -222,7 +230,6 @@ ...@@ -222,7 +230,6 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -259,16 +266,18 @@ ...@@ -259,16 +266,18 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="PGInstrument|Win32" Name="Debug|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -284,6 +293,7 @@ ...@@ -284,6 +293,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -325,9 +335,9 @@ ...@@ -325,9 +335,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="PGInstrument|x64" Name="Release|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -363,7 +373,6 @@ ...@@ -363,7 +373,6 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000" BaseAddress="0x1e1D0000"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -388,9 +397,9 @@ ...@@ -388,9 +397,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="PGUpdate|Win32" Name="PGInstrument|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -408,6 +417,7 @@ ...@@ -408,6 +417,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -425,6 +435,7 @@ ...@@ -425,6 +435,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000" BaseAddress="0x1e1D0000"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -519,11 +530,11 @@ ...@@ -519,11 +530,11 @@
Name="Header Files" Name="Header Files"
> >
<File <File
RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h" RelativePath="..\..\Modules\_multiprocessing\connection.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Modules\_multiprocessing\connection.h" RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"
> >
</File> </File>
</Filter> </Filter>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
......
...@@ -74,11 +74,11 @@ ...@@ -74,11 +74,11 @@
/> />
<UserMacro <UserMacro
Name="sqlite3Dir" Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-source-3.3.4" Value="$(externalsDir)\sqlite-3.5.9"
/> />
<UserMacro <UserMacro
Name="bz2Dir" Name="bz2Dir"
Value="$(externalsDir)\bzip2-1.0.3" Value="$(externalsDir)\bzip2-1.0.5"
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
...@@ -94,18 +94,18 @@ ...@@ -94,18 +94,18 @@
/> />
<UserMacro <UserMacro
Name="tcltkLib" Name="tcltkLib"
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib" Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
/> />
<UserMacro <UserMacro
Name="tcltkLibDebug" Name="tcltkLibDebug"
Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib" Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
/> />
<UserMacro <UserMacro
Name="tcltk64Lib" Name="tcltk64Lib"
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib" Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
/> />
<UserMacro <UserMacro
Name="tcltk64LibDebug" Name="tcltk64LibDebug"
Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib" Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll" OutputFile="$(OutDir)\$(ProjectName)_d.dll"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -104,7 +104,8 @@ ...@@ -104,7 +104,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -118,7 +119,6 @@ ...@@ -118,7 +119,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll" OutputFile="$(OutDir)\$(ProjectName)_d.dll"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -166,7 +166,8 @@ ...@@ -166,7 +166,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -180,7 +181,6 @@ ...@@ -180,7 +181,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll" OutputFile="$(OutDir)\$(ProjectName).dll"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -229,7 +229,8 @@ ...@@ -229,7 +229,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -243,7 +244,6 @@ ...@@ -243,7 +244,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll" OutputFile="$(OutDir)\$(ProjectName).dll"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -291,7 +291,8 @@ ...@@ -291,7 +291,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -304,7 +305,7 @@ ...@@ -304,7 +305,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" OutputFile="$(OutDir)\$(ProjectName).dll"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -353,7 +354,8 @@ ...@@ -353,7 +354,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -366,7 +368,6 @@ ...@@ -366,7 +368,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -414,7 +415,8 @@ ...@@ -414,7 +415,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -427,7 +429,7 @@ ...@@ -427,7 +429,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" OutputFile="$(OutDir)\$(ProjectName).dll"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -476,7 +478,8 @@ ...@@ -476,7 +478,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -489,7 +492,6 @@ ...@@ -489,7 +492,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -521,51 +523,11 @@ ...@@ -521,51 +523,11 @@
Name="Header Files" Name="Header Files"
> >
<File <File
RelativePath="..\..\..\sqlite-source-3.3.4\btree.h" RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\hash.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\os.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\pager.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\parse.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h" RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h"
> >
</File> </File>
</Filter> </Filter>
...@@ -573,167 +535,7 @@ ...@@ -573,167 +535,7 @@
Name="Source Files" Name="Source Files"
> >
<File <File
RelativePath="..\..\..\sqlite-source-3.3.4\alter.c" RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\attach.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\auth.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\btree.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\build.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\callback.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\complete.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\date.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\delete.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\expr.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\func.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\hash.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\insert.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\main.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\os.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\pager.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\parse.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\printf.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\random.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\select.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\shell.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\table.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\update.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\utf.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\util.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c"
>
</File>
<File
RelativePath="..\..\..\sqlite-source-3.3.4\where.c"
> >
</File> </File>
</Filter> </Filter>
......
...@@ -24,7 +24,7 @@ def vs9to8(src, dest): ...@@ -24,7 +24,7 @@ def vs9to8(src, dest):
# Bah. VS8.0 does not expand macros in file names. # Bah. VS8.0 does not expand macros in file names.
# Replace them here. # Replace them here.
lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4') lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9')
lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..') lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32') lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment