diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs index d5daaec2bd..c7e1b78ec8 100644 --- a/w32/vsnet/GetLibs.vbs +++ b/w32/vsnet/GetLibs.vbs @@ -1,4 +1,4 @@ -On Error Resume Next +'On Error Resume Next ' ************** ' Initialization ' ************** @@ -412,12 +412,12 @@ End Sub Sub BuildLibs_sqlite(BuildDebug, BuildRelease) If Not FSO.FolderExists(LibDestDir & "sqlite") Then - WgetUnCompress "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir - If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_2_7") Then + WgetUnCompress "http://www.sqlite.org/sqlite-source-3_3_5.zip", LibDestDir + If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_3_5") Then Wscript.echo "Unable to get SQLite from default download location, Trying backup location:" - WgetUnCompress LibsBase & "sqlite-source-3_2_7.zip", LibDestDir + WgetUnCompress LibsBase & "sqlite-source-3_3_5.zip", LibDestDir End If - RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite" + RenameFolder LibDestDir & "sqlite-source-3_3_5", "sqlite" FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" End If diff --git a/w32/vsnet/Tools/sqlite.vcproj b/w32/vsnet/Tools/sqlite.vcproj index 6954658de4..98bcc13b73 100644 --- a/w32/vsnet/Tools/sqlite.vcproj +++ b/w32/vsnet/Tools/sqlite.vcproj @@ -1,178 +1,288 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + OutputFile="$(OutDir)/sqlite.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + ModuleDefinitionFile="sqlite3.def" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -181,177 +291,228 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath="alter.c" + > + RelativePath="analyze.c" + > + RelativePath="attach.c" + > + RelativePath="auth.c" + > + RelativePath="btree.c" + > + RelativePath="build.c" + > + RelativePath="callback.c" + > + RelativePath="complete.c" + > + RelativePath="date.c" + > + RelativePath="delete.c" + > + RelativePath="expr.c" + > + RelativePath="func.c" + > + RelativePath="hash.c" + > + RelativePath="insert.c" + > + RelativePath="legacy.c" + > + RelativePath="main.c" + > + RelativePath="opcodes.c" + > + RelativePath="os.c" + > + RelativePath="os_unix.c" + > + RelativePath="os_win.c" + > + RelativePath="pager.c" + > + RelativePath="parse.c" + > + RelativePath="pragma.c" + > + RelativePath="prepare.c" + > + RelativePath="printf.c" + > + RelativePath="random.c" + > + RelativePath="select.c" + > + RelativePath="shell.c" + > + RelativePath="table.c" + > + RelativePath="tokenize.c" + > + RelativePath="trigger.c" + > + RelativePath="update.c" + > + RelativePath="utf.c" + > + RelativePath="util.c" + > + RelativePath="vacuum.c" + > + RelativePath="vdbe.c" + > + RelativePath="vdbeapi.c" + > + RelativePath="vdbeaux.c" + > + RelativePath="vdbefifo.c" + > + RelativePath="vdbemem.c" + > + + + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath="btree.h" + > + RelativePath="hash.h" + > + RelativePath="keywordhash.h" + > + RelativePath="opcodes.h" + > + RelativePath="os.h" + > + RelativePath="os_common.h" + > + RelativePath="pager.h" + > + RelativePath="parse.h" + > + RelativePath="sqlite3.h" + > + RelativePath="sqliteInt.h" + > + RelativePath="vdbe.h" + > - - - - + RelativePath="vdbeInt.h" + > -