Skip to content

Commit 8b83803

Browse files
committed
Snapshot of upstream SQLite 3.49.0
1 parent 4a0e62a commit 8b83803

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+4416
-2658
lines changed

Makefile.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,6 @@ distclean-autosetup: clean
323323
rm -f $(TOP)/tool/emcc.sh
324324
rm -f libsqlite3*$(T.dll)
325325
rm -f jimsh0*
326-
# -if [ -f ext/wasm/GNUmakefile ]; then \
327-
# gmake --no-print-directory --ignore-errors -C ext/wasm distclean; \
328-
# fi >/dev/null 2>&1; true
329326
distclean: distclean-autosetup
330327

331328
#
@@ -335,4 +332,5 @@ distclean: distclean-autosetup
335332
version-info$(T.exe): $(TOP)/tool/version-info.c Makefile sqlite3.h
336333
$(T.link) $(ST_OPT) -o $@ $(TOP)/tool/version-info.c
337334

335+
IS_CROSS_COMPILING = @IS_CROSS_COMPILING@
338336
include $(TOP)/main.mk

Makefile.msc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,7 +2334,7 @@ parse.c: $(TOP)\src\parse.y lemon.exe
23342334
.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y
23352335

23362336
$(SQLITE3H): $(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION $(JIM_TCLSH)
2337-
$(JIM_TCLSH) $(TOP)\tool\mksqlite3h.tcl "$(TOP:\=/)" > $(SQLITE3H) $(MKSQLITE3H_ARGS)
2337+
$(JIM_TCLSH) $(TOP)\tool\mksqlite3h.tcl "$(TOP:\=/)" -o $(SQLITE3H) $(MKSQLITE3H_ARGS)
23382338

23392339
sqlite3ext.h: .target_source
23402340
!IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
@@ -2398,7 +2398,7 @@ SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
23982398
!ENDIF
23992399

24002400
shell.c: $(SHELL_DEP) $(TOP)\tool\mkshellc.tcl $(JIM_TCLSH)
2401-
$(JIM_TCLSH) $(TOP)\tool\mkshellc.tcl > shell.c
2401+
$(JIM_TCLSH) $(TOP)\tool\mkshellc.tcl shell.c
24022402

24032403
zlib:
24042404
pushd $(ZLIBDIR) && $(MAKE) /f win32\Makefile.msc clean $(ZLIBLIB) && popd
@@ -2811,7 +2811,8 @@ moreclean: clean
28112811

28122812
clean:
28132813
del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL
2814-
del /Q *.bsc *.def *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
2814+
del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
2815+
del /Q sqlite3.def tclsqlite3.def 2>NUL
28152816
del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL
28162817
# <<mark>>
28172818
del /Q $(SQLITE3TCLDLL) pkgIndex.tcl 2>NUL

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.48.0
1+
3.49.0

0 commit comments

Comments
 (0)