mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-08 14:02:16 +03:00
Merge recent enhancements from trunk.
FossilOrigin-Name: aafe1fec803ddf207bbcb3c669da0a9639411375fc04a52066dde4eb99c3c11b
This commit is contained in:
@@ -29,6 +29,8 @@ IF DEFINED PROCESSOR (
|
||||
GOTO usage
|
||||
)
|
||||
|
||||
SET PROCESSOR=%PROCESSOR:AMD64=x64%
|
||||
|
||||
%_VECHO% Processor = '%PROCESSOR%'
|
||||
|
||||
SET DUMMY2=%2
|
||||
@@ -193,12 +195,19 @@ ECHO.
|
||||
GOTO no_errors
|
||||
|
||||
:fn_TclKitX86Variables
|
||||
REM
|
||||
REM NOTE: By default, use latest available version of the TclKit SDK
|
||||
REM for x86. However, the "default" TclKit executable for x86
|
||||
REM is still used here because it is the only one "well-known"
|
||||
REM to be available for download.
|
||||
REM
|
||||
IF NOT DEFINED TCLKIT_PATCHLEVEL (
|
||||
SET TCLKIT_PATCHLEVEL=8.6.4
|
||||
SET TCLKIT_PATCHLEVEL=8.6.6
|
||||
)
|
||||
SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
|
||||
SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
|
||||
SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
|
||||
REM SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
|
||||
SET TCLKIT_EXE=tclkit-8.6.4.exe
|
||||
SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
|
||||
SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
|
||||
SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL%
|
||||
@@ -210,20 +219,19 @@ GOTO no_errors
|
||||
GOTO :EOF
|
||||
|
||||
:fn_TclKitX64Variables
|
||||
REM
|
||||
REM NOTE: By default, use latest available version of the TclKit SDK
|
||||
REM for x64. However, the "default" TclKit executable for x86
|
||||
REM is still used here because it is the only one "well-known"
|
||||
REM to be available for download.
|
||||
REM
|
||||
IF NOT DEFINED TCLKIT_PATCHLEVEL (
|
||||
REM
|
||||
REM NOTE: By default, use latest available version of the TclKit SDK
|
||||
REM for x64. However, the "default" TclKit executable for x86
|
||||
REM is still used here because it is the only one "well-known"
|
||||
REM to be available for download.
|
||||
REM
|
||||
SET TCLKIT_PATCHLEVEL=8.6.3
|
||||
SET TCLKIT_EXE=tclkit-8.6.4.exe
|
||||
) ELSE (
|
||||
SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
|
||||
SET TCLKIT_PATCHLEVEL=8.6.6
|
||||
)
|
||||
SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
|
||||
SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
|
||||
REM SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
|
||||
SET TCLKIT_EXE=tclkit-8.6.4.exe
|
||||
SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
|
||||
SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
|
||||
SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL%
|
||||
|
Reference in New Issue
Block a user