Improvements to the MSVC build. Fix harmless compiler warnings. Enable use of ...

FossilOrigin-Name: 737630b87314283b2c38790ace9d25ec05f81f4a

diff --git a/Makefile.msc b/Makefile.msc
index 58d370fcde30d14a1d68b4d6c4b960f26fc4da22..c9df10557bafbf4362347c10af63600204233afd 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -22,8 +22,22 @@ USE_AMALGAMATION = 1
 USE_FULLWARN = 0
 !ENDIF
 
+# Set this non-0 to use "stdcall" calling convention for the core library
+# and shell executable.
+#
+!IFNDEF USE_STDCALL
+USE_STDCALL = 0
+!ENDIF
+
+# Set this non-0 to have the shell executable link against the core dynamic
+# link library.
+#
+!IFNDEF DYNAMIC_SHELL
+DYNAMIC_SHELL = 0
+!ENDIF
+
 # If necessary, create a list of harmless compiler warnings to disable when
-# compiling the build tools.  For the SQLite source code itself, warnings,
+# compiling the various tools.  For the SQLite source code itself, warnings,
 # if any, will be disabled from within it.
 #
 !IFNDEF NO_WARN
@@ -256,9 +270,9 @@ NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 # will run on the platform that is doing the build.
 #
 !IF $(USE_FULLWARN)!=0
-BCC = $(NCC) -W4
+BCC = $(NCC) -nologo -W4
 !ELSE
-BCC = $(NCC) -W3
+BCC = $(NCC) -nologo -W3
 !ENDIF
 
 # Check if assembly code listings should be generated for the source
@@ -281,14 +295,106 @@ NLTLIBPATHS = "/LIBPATH:$(NCRTLIBPATH)" "/LIBPATH:$(NSDKLIBPATH)"
 # same unless your are cross-compiling.)
 #
 !IF $(USE_FULLWARN)!=0
-TCC = $(CC) -W4 -DINCLUDE_MSVC_H=1
+TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1
 !ELSE
-TCC = $(CC) -W3
+TCC = $(CC) -nologo -W3
 !ENDIF
 
 TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src -fp:precise
 RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src
 
+# Check if we want to use the "stdcall" calling convention when compiling.
+# This is not supported by the compilers for non-x86 platforms.  It should
+# also be noted here that building any target with these "stdcall" options
+# will most likely fail if the Tcl library is also required.  This is due
+# to how the Tcl library functions are declared and exported (i.e. without
+# an explicit calling convention, which results in "cdecl").
+#
+!IF $(USE_STDCALL)!=0
+!IF "$(PLATFORM)"=="x86"
+CORE_CCONV_OPTS = -Gz -DUSE_STDCALL=1 -DSQLITE_CDECL=__cdecl
+SHELL_CCONV_OPTS = -Gz -DUSE_STDCALL=1 -DSQLITE_CDECL=__cdecl
+!ELSE
+!IFNDEF PLATFORM
+CORE_CCONV_OPTS = -Gz -DUSE_STDCALL=1 -DSQLITE_CDECL=__cdecl
+SHELL_CCONV_OPTS = -Gz -DUSE_STDCALL=1 -DSQLITE_CDECL=__cdecl
+!ELSE
+CORE_CCONV_OPTS =
+SHELL_CCONV_OPTS =
+!ENDIF
+!ENDIF
+!ELSE
+CORE_CCONV_OPTS =
+SHELL_CCONV_OPTS =
+!ENDIF
+
+# These are additional compiler options used for the core library.
+#
+!IFNDEF CORE_COMPILE_OPTS
+!IF $(USE_STDCALL)!=0
+CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS) -DSQLITE_API=__declspec(dllexport)
+!ELSE
+CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS)
+!ENDIF
+!ENDIF
+
+# These are the additional targets that the core library should depend on
+# when linking.
+#
+!IFNDEF CORE_LINK_DEP
+!IF $(USE_STDCALL)!=0
+CORE_LINK_DEP =
+!ELSE
+CORE_LINK_DEP = sqlite3.def
+!ENDIF
+!ENDIF
+
+# These are additional linker options used for the core library.
+#
+!IFNDEF CORE_LINK_OPTS
+!IF $(USE_STDCALL)!=0
+CORE_LINK_OPTS =
+!ELSE
+CORE_LINK_OPTS = /DEF:sqlite3.def
+!ENDIF
+!ENDIF
+
+# These are additional compiler options used for the shell executable.
+#
+!IFNDEF SHELL_COMPILE_OPTS
+!IF $(DYNAMIC_SHELL)!=0
+SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport)
+!ELSE
+SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS)
+!ENDIF
+!ENDIF
+
+# This is the core library that the shell executable should depend on.
+#
+!IFNDEF SHELL_CORE_DEP
+!IF $(DYNAMIC_SHELL)!=0
+SHELL_CORE_DEP = sqlite3.dll
+!ELSE
+SHELL_CORE_DEP = libsqlite3.lib
+!ENDIF
+!ENDIF
+
+# This is the core library that the shell executable should link with.
+#
+!IFNDEF SHELL_CORE_LIB
+!IF $(DYNAMIC_SHELL)!=0
+SHELL_CORE_LIB = sqlite3.lib
+!ELSE
+SHELL_CORE_LIB = libsqlite3.lib
+!ENDIF
+!ENDIF
+
+# These are additional linker options used for the shell executable.
+#
+!IFNDEF SHELL_LINK_OPTS
+SHELL_LINK_OPTS = $(SHELL_CORE_LIB)
+!ENDIF
+
 # Check if assembly code listings should be generated for the source
 # code files to be compiled.
 #
@@ -587,8 +693,11 @@ LTLINK = $(LTLINK) rpcrt4.lib
 # set this for you.  Otherwise, the linker will attempt
 # to deduce the binary type based on the object files.
 !IFDEF PLATFORM
-LTLINKOPTS = /MACHINE:$(PLATFORM)
-LTLIBOPTS = /MACHINE:$(PLATFORM)
+LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
+LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)
+!ELSE
+LTLINKOPTS = /NOLOGO
+LTLIBOPTS = /NOLOGO
 !ENDIF
 
 # When compiling for use in the WinRT environment, the following
@@ -1041,13 +1150,13 @@ libsqlite3.lib: $(LIBOBJ)
 libtclsqlite3.lib:     tclsqlite.lo libsqlite3.lib
        $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
 
-sqlite3.exe:   $(TOP)\src\shell.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
-       $(LTLINK) $(READLINE_FLAGS) $(TOP)\src\shell.c \
-               /link $(LTLINKOPTS) $(LTLIBPATHS) libsqlite3.lib $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
+sqlite3.exe:   $(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
+       $(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c \
+               /link /pdb:sqlite3sh.pdb $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
-mptester.exe:  $(TOP)\mptest\mptest.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
-       $(LTLINK) $(TOP)\mptest\mptest.c \
-               /link $(LTLINKOPTS) $(LTLIBPATHS) libsqlite3.lib $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
+mptester.exe:  $(TOP)\mptest\mptest.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
+       $(LTLINK) $(SHELL_COMPILE_OPTS) $(TOP)\mptest\mptest.c \
+               /link $(LTLINKOPTS) $(LTLIBPATHS) $(SHELL_LINK_OPTS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
@@ -1056,14 +1165,14 @@ mptester.exe:   $(TOP)\mptest\mptest.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
 # all that automatic generation.
 #
 .target_source:        $(SRC) $(TOP)\tool\vdbe-compress.tcl
-       -rmdir /S/Q tsrc
+       -rmdir /Q/S tsrc 2>NUL
        -mkdir tsrc
        for %i in ($(SRC1)) do copy /Y %i tsrc
        for %i in ($(SRC2)) do copy /Y %i tsrc
        for %i in ($(SRC3)) do copy /Y %i tsrc
        for %i in ($(SRC4)) do copy /Y %i tsrc
        for %i in ($(SRC5)) do copy /Y %i tsrc
-       del /Q tsrc\sqlite.h.in tsrc\parse.y
+       del /Q tsrc\sqlite.h.in tsrc\parse.y 2>NUL
        $(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl $(OPTS) < tsrc\vdbe.c > vdbe.new
        move vdbe.new tsrc\vdbe.c
        echo > .target_source
@@ -1088,7 +1197,7 @@ SQLITE3C = sqlite3.c
 # Rule to build the amalgamation
 #
 sqlite3.lo:    $(SQLITE3C)
-       $(LTCOMPILE) -c $(SQLITE3C)
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(SQLITE3C)
 
 # Rules to build the LEMON compiler generator
 #
@@ -1106,10 +1215,10 @@ lemon.exe:      $(TOP)\tool\lemon.c lempar.c
 #     opcodes.lo
 #
 parse.lo:      parse.c $(HDR)
-       $(LTCOMPILE) -c parse.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c parse.c
 
 opcodes.lo:    opcodes.c
-       $(LTCOMPILE) -c opcodes.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c opcodes.c
 
 # Rule to build the Win32 resources object file.
 #
@@ -1127,223 +1236,223 @@ $(LIBRESOBJS):        $(TOP)\src\sqlite3.rc $(HDR)
 # Rules to build individual *.lo files from files in the src directory.
 #
 alter.lo:      $(TOP)\src\alter.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\alter.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\alter.c
 
 analyze.lo:    $(TOP)\src\analyze.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\analyze.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\analyze.c
 
 attach.lo:     $(TOP)\src\attach.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\attach.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\attach.c
 
 auth.lo:       $(TOP)\src\auth.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\auth.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\auth.c
 
 backup.lo:     $(TOP)\src\backup.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\backup.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\backup.c
 
 bitvec.lo:     $(TOP)\src\bitvec.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\bitvec.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\bitvec.c
 
 btmutex.lo:    $(TOP)\src\btmutex.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\btmutex.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\btmutex.c
 
 btree.lo:      $(TOP)\src\btree.c $(HDR) $(TOP)\src\pager.h
-       $(LTCOMPILE) -c $(TOP)\src\btree.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\btree.c
 
 build.lo:      $(TOP)\src\build.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\build.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\build.c
 
 callback.lo:   $(TOP)\src\callback.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\callback.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\callback.c
 
 complete.lo:   $(TOP)\src\complete.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\complete.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\complete.c
 
 ctime.lo:      $(TOP)\src\ctime.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\ctime.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\ctime.c
 
 date.lo:       $(TOP)\src\date.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\date.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\date.c
 
 delete.lo:     $(TOP)\src\delete.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\delete.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\delete.c
 
 expr.lo:       $(TOP)\src\expr.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\expr.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\expr.c
 
 fault.lo:      $(TOP)\src\fault.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\fault.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\fault.c
 
 fkey.lo:       $(TOP)\src\fkey.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\fkey.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\fkey.c
 
 func.lo:       $(TOP)\src\func.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\func.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\func.c
 
 global.lo:     $(TOP)\src\global.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\global.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\global.c
 
 hash.lo:       $(TOP)\src\hash.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\hash.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\hash.c
 
 insert.lo:     $(TOP)\src\insert.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\insert.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\insert.c
 
 journal.lo:    $(TOP)\src\journal.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\journal.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\journal.c
 
 legacy.lo:     $(TOP)\src\legacy.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\legacy.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\legacy.c
 
 loadext.lo:    $(TOP)\src\loadext.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\loadext.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\loadext.c
 
 main.lo:       $(TOP)\src\main.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\main.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\main.c
 
 malloc.lo:     $(TOP)\src\malloc.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\malloc.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\malloc.c
 
 mem0.lo:       $(TOP)\src\mem0.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mem0.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mem0.c
 
 mem1.lo:       $(TOP)\src\mem1.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mem1.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mem1.c
 
 mem2.lo:       $(TOP)\src\mem2.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mem2.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mem2.c
 
 mem3.lo:       $(TOP)\src\mem3.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mem3.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mem3.c
 
 mem5.lo:       $(TOP)\src\mem5.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mem5.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mem5.c
 
 memjournal.lo: $(TOP)\src\memjournal.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\memjournal.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\memjournal.c
 
 mutex.lo:      $(TOP)\src\mutex.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mutex.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mutex.c
 
 mutex_noop.lo: $(TOP)\src\mutex_noop.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mutex_noop.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mutex_noop.c
 
 mutex_unix.lo: $(TOP)\src\mutex_unix.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mutex_unix.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mutex_unix.c
 
 mutex_w32.lo:  $(TOP)\src\mutex_w32.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\mutex_w32.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\mutex_w32.c
 
 notify.lo:     $(TOP)\src\notify.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\notify.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\notify.c
 
 pager.lo:      $(TOP)\src\pager.c $(HDR) $(TOP)\src\pager.h
-       $(LTCOMPILE) -c $(TOP)\src\pager.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\pager.c
 
 pcache.lo:     $(TOP)\src\pcache.c $(HDR) $(TOP)\src\pcache.h
-       $(LTCOMPILE) -c $(TOP)\src\pcache.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\pcache.c
 
 pcache1.lo:    $(TOP)\src\pcache1.c $(HDR) $(TOP)\src\pcache.h
-       $(LTCOMPILE) -c $(TOP)\src\pcache1.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\pcache1.c
 
 os.lo: $(TOP)\src\os.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\os.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os.c
 
 os_unix.lo:    $(TOP)\src\os_unix.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\os_unix.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os_unix.c
 
 os_win.lo:     $(TOP)\src\os_win.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\os_win.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\os_win.c
 
 pragma.lo:     $(TOP)\src\pragma.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\pragma.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\pragma.c
 
 prepare.lo:    $(TOP)\src\prepare.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\prepare.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\prepare.c
 
 printf.lo:     $(TOP)\src\printf.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\printf.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\printf.c
 
 random.lo:     $(TOP)\src\random.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\random.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\random.c
 
 resolve.lo:    $(TOP)\src\resolve.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\resolve.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\resolve.c
 
 rowset.lo:     $(TOP)\src\rowset.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\rowset.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\rowset.c
 
 select.lo:     $(TOP)\src\select.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\select.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\select.c
 
 status.lo:     $(TOP)\src\status.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\status.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\status.c
 
 table.lo:      $(TOP)\src\table.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\table.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\table.c
 
 threads.lo:    $(TOP)\src\threads.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\threads.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\threads.c
 
 tokenize.lo:   $(TOP)\src\tokenize.c keywordhash.h $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\tokenize.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\tokenize.c
 
 trigger.lo:    $(TOP)\src\trigger.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\trigger.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\trigger.c
 
 update.lo:     $(TOP)\src\update.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\update.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\update.c
 
 utf.lo:        $(TOP)\src\utf.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\utf.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\utf.c
 
 util.lo:       $(TOP)\src\util.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\util.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\util.c
 
 vacuum.lo:     $(TOP)\src\vacuum.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vacuum.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vacuum.c
 
 vdbe.lo:       $(TOP)\src\vdbe.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbe.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbe.c
 
 vdbeapi.lo:    $(TOP)\src\vdbeapi.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbeapi.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbeapi.c
 
 vdbeaux.lo:    $(TOP)\src\vdbeaux.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbeaux.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbeaux.c
 
 vdbeblob.lo:   $(TOP)\src\vdbeblob.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbeblob.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbeblob.c
 
 vdbemem.lo:    $(TOP)\src\vdbemem.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbemem.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbemem.c
 
 vdbesort.lo:   $(TOP)\src\vdbesort.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbesort.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbesort.c
 
 vdbetrace.lo:  $(TOP)\src\vdbetrace.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vdbetrace.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbetrace.c
 
 vtab.lo:       $(TOP)\src\vtab.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\vtab.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vtab.c
 
 wal.lo:        $(TOP)\src\wal.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\wal.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\wal.c
 
 walker.lo:     $(TOP)\src\walker.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\walker.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\walker.c
 
 where.lo:      $(TOP)\src\where.c $(HDR)
-       $(LTCOMPILE) -c $(TOP)\src\where.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\where.c
 
 tclsqlite.lo:  $(TOP)\src\tclsqlite.c $(HDR)
-       $(LTCOMPILE) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
+       $(LTCOMPILE) $(NO_WARN) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
 tclsqlite-shell.lo:    $(TOP)\src\tclsqlite.c $(HDR)
-       $(LTCOMPILE) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
+       $(LTCOMPILE) $(NO_WARN) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
-tclsqlite3.exe:        tclsqlite-shell.lo libsqlite3.lib $(LIBRESOBJS)
-       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /OUT:$@ libsqlite3.lib tclsqlite-shell.lo $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
+tclsqlite3.exe:        tclsqlite-shell.lo $(SQLITE3C) $(LIBRESOBJS)
+       $(LTLINK) $(SQLITE3C) /link $(LTLINKOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite-shell.lo $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
 # Rules to build opcodes.c and opcodes.h
 #
@@ -1358,7 +1467,7 @@ opcodes.h:        parse.h $(TOP)\src\vdbe.c $(TOP)\mkopcodeh.awk
 parse.h:       parse.c
 
 parse.c:       $(TOP)\src\parse.y lemon.exe $(TOP)\addopcodes.awk
-       del /Q parse.y parse.h parse.h.temp
+       del /Q parse.y parse.h parse.h.temp 2>NUL
        copy $(TOP)\src\parse.y .
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) parse.y
        move parse.h parse.h.temp
@@ -1379,67 +1488,67 @@ keywordhash.h:  $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
 # Rules to build the extension objects.
 #
 icu.lo:        $(TOP)\ext\icu\icu.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\icu\icu.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\icu\icu.c
 
 fts2.lo:       $(TOP)\ext\fts2\fts2.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2.c
 
 fts2_hash.lo:  $(TOP)\ext\fts2\fts2_hash.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_hash.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_hash.c
 
 fts2_icu.lo:   $(TOP)\ext\fts2\fts2_icu.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_icu.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_icu.c
 
 fts2_porter.lo:        $(TOP)\ext\fts2\fts2_porter.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_porter.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_porter.c
 
 fts2_tokenizer.lo:     $(TOP)\ext\fts2\fts2_tokenizer.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer.c
 
 fts2_tokenizer1.lo:    $(TOP)\ext\fts2\fts2_tokenizer1.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer1.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer1.c
 
 fts3.lo:       $(TOP)\ext\fts3\fts3.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3.c
 
 fts3_aux.lo:   $(TOP)\ext\fts3\fts3_aux.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_aux.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_aux.c
 
 fts3_expr.lo:  $(TOP)\ext\fts3\fts3_expr.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_expr.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_expr.c
 
 fts3_hash.lo:  $(TOP)\ext\fts3\fts3_hash.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_hash.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_hash.c
 
 fts3_icu.lo:   $(TOP)\ext\fts3\fts3_icu.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_icu.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_icu.c
 
 fts3_snippet.lo:       $(TOP)\ext\fts3\fts3_snippet.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_snippet.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_snippet.c
 
 fts3_porter.lo:        $(TOP)\ext\fts3\fts3_porter.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_porter.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_porter.c
 
 fts3_tokenizer.lo:     $(TOP)\ext\fts3\fts3_tokenizer.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer.c
 
 fts3_tokenizer1.lo:    $(TOP)\ext\fts3\fts3_tokenizer1.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer1.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer1.c
 
 fts3_tokenize_vtab.lo: $(TOP)\ext\fts3\fts3_tokenize_vtab.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenize_vtab.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenize_vtab.c
 
 fts3_unicode.lo:       $(TOP)\ext\fts3\fts3_unicode.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode.c
 
 fts3_unicode2.lo:      $(TOP)\ext\fts3\fts3_unicode2.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode2.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode2.c
 
 fts3_write.lo: $(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
 
 rtree.lo:      $(TOP)\ext\rtree\rtree.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\rtree\rtree.c
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\rtree\rtree.c
 
 
 # Rules to build the 'testfixture' application.
@@ -1453,7 +1562,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
 
-TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) libsqlite3.lib
+TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) $(SHELL_CORE_DEP)
 TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
 !IF $(USE_AMALGAMATION)==0
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
@@ -1493,52 +1602,52 @@ sqlite3_analyzer.c: $(SQLITE3C) $(TOP)\src\test_stat.c $(TOP)\src\tclsqlite.c $(
        echo ; return zMainloop; } >> $@
 
 sqlite3_analyzer.exe:  sqlite3_analyzer.c $(LIBRESOBJS)
-       $(LTLINK) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
+       $(LTLINK) $(NO_WARN) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
                /link $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
 testloadext.lo:        $(TOP)\src\test_loadext.c
-       $(LTCOMPILE) -c $(TOP)\src\test_loadext.c
+       $(LTCOMPILE) $(NO_WARN) -c $(TOP)\src\test_loadext.c
 
 testloadext.dll: testloadext.lo
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ testloadext.lo
 
 showdb.exe:    $(TOP)\tool\showdb.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\showdb.c $(SQLITE3C)
 
 showstat4.exe: $(TOP)\tool\showstat4.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\showstat4.c $(SQLITE3C)
 
 showjournal.exe:       $(TOP)\tool\showjournal.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\showjournal.c $(SQLITE3C)
 
 showwal.exe:   $(TOP)\tool\showwal.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\showwal.c $(SQLITE3C)
 
 fts3view.exe:  $(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C)
 
 rollback-test.exe:     $(TOP)\tool\rollback-test.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\tool\rollback-test.c $(SQLITE3C)
 
 LogEst.exe:    $(TOP)\tool\logest.c sqlite3.h
-       $(LTLINK) -Fe$@ $(TOP)\tool\LogEst.c
+       $(LTLINK) $(NO_WARN) -Fe$@ $(TOP)\tool\LogEst.c
 
 wordcount.exe: $(TOP)\test\wordcount.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\test\wordcount.c $(SQLITE3C)
 
 speedtest1.exe:        $(TOP)\test\speedtest1.c $(SQLITE3C)
-       $(LTLINK) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+       $(LTLINK) $(NO_WARN) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\test\speedtest1.c $(SQLITE3C)
 
 clean:
-       del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib 2>NUL
+       del /Q *.exp *.lo *.ilk *.lib *.obj *.pdb 2>NUL
        del /Q *.cod *.da *.bb *.bbg gmon.out 2>NUL
        del /Q sqlite3.h opcodes.c opcodes.h 2>NUL
        del /Q lemon.* lempar.c parse.* 2>NUL
@@ -1551,19 +1660,18 @@ clean:
        -rmdir /Q/S quota2c 2>NUL
        -rmdir /Q/S tsrc 2>NUL
        del /Q .target_source 2>NUL
-       del /Q tclsqlite3.exe tclsqlite3.exp 2>NUL
-       del /Q testloadext.dll testloadext.exp 2>NUL
-       del /Q testfixture.exe testfixture.exp test.db 2>NUL
+       del /Q tclsqlite3.exe 2>NUL
+       del /Q testloadext.dll 2>NUL
+       del /Q testfixture.exe test.db 2>NUL
        del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe 2>NUL
        del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe 2>NUL
-       del /Q wordcount.exe 2>NUL
-       del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def 2>NUL
+       del /Q mptester.exe wordcount.exe 2>NUL
+       del /Q sqlite3.exe sqlite3.dll sqlite3.def 2>NUL
        del /Q sqlite3.c sqlite3-*.c 2>NUL
        del /Q sqlite3rc.h 2>NUL
        del /Q shell.c sqlite3ext.h 2>NUL
-       del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp sqlite3_analyzer.c 2>NUL
+       del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
        del /Q sqlite-*-output.vsix 2>NUL
-       del /Q mptester.exe 2>NUL
 
 # Dynamic link library section.
 #
@@ -1575,5 +1683,5 @@ sqlite3.def: libsqlite3.lib
                | $(NAWK) "/ 1 _?sqlite3_/ { sub(/^.* _?/,\"\");print }" \
                | sort >> sqlite3.def
 
-sqlite3.dll: $(LIBOBJ) $(LIBRESOBJS) sqlite3.def
-       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /DEF:sqlite3.def /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
+sqlite3.dll: $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
+       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 09294bc45a627e350f841d37cde96677bc502425..a16070766ff896e7a5b5f8b080cd5ae99555e0d9 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1625,7 +1625,10 @@ int sqlite3Fts3SegReaderNew(
 ** an array of pending terms by term. This occurs as part of flushing
 ** the contents of the pending-terms hash table to the database.
 */
-static int fts3CompareElemByTerm(const void *lhs, const void *rhs){
+static int SQLITE_CDECL fts3CompareElemByTerm(
+  const void *lhs,
+  const void *rhs
+){
   char *z1 = fts3HashKey(*(Fts3HashElem **)lhs);
   char *z2 = fts3HashKey(*(Fts3HashElem **)rhs);
   int n1 = fts3HashKeysize(*(Fts3HashElem **)lhs);

diff --git a/ext/fts3/tool/fts3view.c b/ext/fts3/tool/fts3view.c
index 3dc1ba80fee088e6aefa9e068431abe5dae48ebb..6dada352b3a49fa02460aeeeac125e0f3e492984 100644 (file)
--- a/ext/fts3/tool/fts3view.c
+++ b/ext/fts3/tool/fts3view.c
@@ -504,7 +504,7 @@ static void showSegdirMap(sqlite3 *db, const char *zTab){
                        sqlite3_column_int64(pStmt,5));
       printf("  root   %9s\n", rtag);
       if( iLEnd>iStart ){
-        sqlite3_int64 iLower, iPrev, iX;
+        sqlite3_int64 iLower, iPrev = 0, iX;
         if( iLEnd+1<=iEnd ){
           sqlite3_bind_int64(pStmt2, 1, iLEnd+1);
           sqlite3_bind_int64(pStmt2, 2, iEnd);
@@ -548,7 +548,7 @@ static void decodeSegment(
   const unsigned char *aData,   /* Content to print */
   int nData                     /* Number of bytes of content */
 ){
-  sqlite3_int64 iChild;
+  sqlite3_int64 iChild = 0;
   sqlite3_int64 iPrefix;
   sqlite3_int64 nTerm;
   sqlite3_int64 n;

diff --git a/manifest b/manifest
index fdb6dee09d8cdba821fe0f017b5b8fac226a5552..e5751c50936b124b68a734da73b1d8f355938a6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Provide\sthe\sBTREE_SEEK_EQ\shint\sto\sthe\sb-tree\slayer.
-D 2015-03-20T16:54:29.996
+C Improvements\sto\sthe\sMSVC\sbuild.\s\sFix\sharmless\scompiler\swarnings.\s\sEnable\suse\sof\s'stdcall'.
+D 2015-03-21T02:22:37.291
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
+F Makefile.msc e8614ec3a5f84c92bc70eaf99a2d6cb622494706
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@ -96,10 +96,10 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c a93f5edc0aff44ef8b06d7cb55b52026541ca145
 F ext/fts3/fts3_unicode2.c c3d01968d497bd7001e7dc774ba75b372738c057
-F ext/fts3/fts3_write.c 9b3a32cbecf40a1f41cb08c00df8c066c23c7a25
+F ext/fts3/fts3_write.c 7104ec015474ee61a8a570349b925f35c6b0a294
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
-F ext/fts3/tool/fts3view.c 3986531f2fc0ceca0c89c31ec7d0589b6adb19d6
+F ext/fts3/tool/fts3view.c 8e53d0190a7b3443764bbd32ad47be2bd852026d
 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
 F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 F ext/fts3/unicode/mkunicode.tcl a2567f9d6ad6779879a2e394c120ad8718557e65
@@ -160,7 +160,7 @@ F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
 F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
-F mptest/mptest.c 0c0c82c1d9aea0b1a60ef9456a04c35ab1106622
+F mptest/mptest.c 1e464f41f1bbc6578d6925043da56170f83aea96
 F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@ -231,8 +231,8 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
-F src/shell.c d1ecce877f899abc97cabdf6a0b8323b8c5a0b69
-F src/sqlite.h.in 2d48e05677d0f9b06b7757662eef3cebea02d837
+F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
+F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
@@ -1194,7 +1194,7 @@ F test/without_rowid6.test deddb78ef539c355bddec00cdfaea6c56efd8b3f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/build-all-msvc.bat a0534c971b86fe95f1983f445db5b896d3394818 x
+F tool/build-all-msvc.bat 62785b25bf7ea82dc016b3233a896151c786cfbb x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1223,7 +1223,7 @@ F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
-F tool/showdb.c bd073a78bce714a0e42d92ea474b3eb8cb53be5d
+F tool/showdb.c 63cdef19e7fbca0c164b096ef8aef3bb9e9dd222
 F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
 F tool/showstat4.c 9515faa8ec176599d4a8288293ba8ec61f7b728a
 F tool/showwal.c 85cb36d4fe3e93e2fbd63e786e0d1ce42d0c4fad
@@ -1246,8 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P eddc05e7bb31fae74daa86e0504a3478b99fa0f2 78df0ce13d4f35226f2571bd7de78484ccbee4bb
-R 05881cbceea02fa7c850b941dd3796f0
-T +closed 78df0ce13d4f35226f2571bd7de78484ccbee4bb
-U drh
-Z 56e9c50c3a6de45bb59df03b69a9852f
+P 3c367004dab0a1a24d955482c97b0f2d84129ab6
+R 80f691e361888d14a716e1419942fc85
+U mistachkin
+Z 872c461d0c616b6e0a705e4083626167

diff --git a/manifest.uuid b/manifest.uuid
index 2068f03662f8b6f7d3c480f0608c9ee5f53b4c31..2ad63efd49ed9192ff4b43a22a63c8013d4a961f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c367004dab0a1a24d955482c97b0f2d84129ab6
\ No newline at end of file
+737630b87314283b2c38790ace9d25ec05f81f4a
\ No newline at end of file

diff --git a/mptest/mptest.c b/mptest/mptest.c
index fdfe5f4a9dfb03954572642daebd6eaf7f93b48c..40c14bc87a6f1de380c665d0cd0ff3bb700aa232 100644 (file)
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@ -1252,7 +1252,7 @@ static void unrecognizedArguments(
   exit(1);
 }
 
-int main(int argc, char **argv){
+int SQLITE_CDECL main(int argc, char **argv){
   const char *zClient;
   int iClient;
   int n, i;

diff --git a/src/shell.c b/src/shell.c
index 752106fcafb9c93ecd2d013768467a0bcff41663..d5a8a3fe95dff2740492358b232a66e96b9e2ec1 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2143,7 +2143,7 @@ static void import_append_char(ImportCtx *p, int c){
 **      EOF on end-of-file.
 **   +  Report syntax errors on stderr
 */
-static char *csv_read_one_field(ImportCtx *p){
+static char *SQLITE_CDECL csv_read_one_field(ImportCtx *p){
   int c;
   int cSep = p->cColSep;
   int rSep = p->cRowSep;
@@ -2217,7 +2217,7 @@ static char *csv_read_one_field(ImportCtx *p){
 **      EOF on end-of-file.
 **   +  Report syntax errors on stderr
 */
-static char *ascii_read_one_field(ImportCtx *p){
+static char *SQLITE_CDECL ascii_read_one_field(ImportCtx *p){
   int c;
   int cSep = p->cColSep;
   int rSep = p->cRowSep;
@@ -2911,8 +2911,8 @@ static int do_meta_command(char *zLine, ShellState *p){
     int nSep;                   /* Number of bytes in p->colSeparator[] */
     char *zSql;                 /* An SQL statement */
     ImportCtx sCtx;             /* Reader context */
-    char *(*xRead)(ImportCtx*); /* Procedure to read one value */
-    int (*xCloser)(FILE*);      /* Procedure to close th3 connection */
+    char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
+    int (SQLITE_CDECL *xCloser)(FILE*);      /* Func to close file */
 
     if( nArg!=3 ){
       fprintf(stderr, "Usage: .import FILE TABLE\n");
@@ -4354,7 +4354,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){
   return argv[i];
 }
 
-int main(int argc, char **argv){
+int SQLITE_CDECL main(int argc, char **argv){
   char *zErrMsg = 0;
   ShellState data;
   const char *zInitFile = 0;

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ed0318fe3aa55543a2e6e258817afe12648bd007..9e48620c664a0d82984c6b1e565a131db93f239d 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -49,6 +49,13 @@ extern "C" {
 # define SQLITE_EXTERN extern
 #endif
 
+/*
+** Add the ability to override 'cdecl'
+*/
+#ifndef SQLITE_CDECL
+# define SQLITE_CDECL
+#endif
+
 /*
 ** These no-op macros are used in front of interfaces to mark those
 ** interfaces as either deprecated or experimental.  New applications

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 1fb61d4df8feeac6d90fece6c4518e7983d9354d..2ae202620a1624b976a1325fa47f8c98db57c3e4 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -58,6 +58,9 @@ IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)\r
 IF NOT DEFINED _VECHO (SET _VECHO=REM)\r
 \r
+SET REDIRECT=^>\r
+IF DEFINED __ECHO SET REDIRECT=^^^>\r
+\r
 %_AECHO% Running %0 %*\r
 \r
 REM SET DFLAGS=/L\r
@@ -420,11 +423,11 @@ FOR %%P IN (%PLATFORMS%) DO (
         ) ELSE (\r
           REM\r
           REM NOTE: Even when the cleaning step has been disabled, we still\r
-          REM       need to remove the build output for the files we are\r
+          REM       need to remove the build output for all the files we are\r
           REM       specifically wanting to build for each platform.\r
           REM\r
-          %_AECHO% Cleaning final output files only...\r
-          %__ECHO% DEL /Q *.lo sqlite3.dll sqlite3.lib sqlite3.pdb\r
+          %_AECHO% Cleaning final core library output files only...\r
+          %__ECHO% DEL /Q *.lo sqlite3.dll sqlite3.lib sqlite3.pdb 2%REDIRECT% NUL\r
         )\r
 \r
         REM\r
@@ -476,6 +479,64 @@ FOR %%P IN (%PLATFORMS%) DO (
             GOTO errors\r
           )\r
         )\r
+\r
+        REM\r
+        REM NOTE: If requested, also build the shell executable.\r
+        REM\r
+        IF DEFINED BUILD_ALL_SHELL (\r
+          REM\r
+          REM NOTE: If necessary, make sure any previous build output for the\r
+          REM       shell executable is deleted.\r
+          REM\r
+          IF DEFINED NOCLEAN (\r
+            REM\r
+            REM NOTE: Even when the cleaning step has been disabled, we still\r
+            REM       need to remove the build output for all the files we are\r
+            REM       specifically wanting to build for each platform.\r
+            REM\r
+            %_AECHO% Cleaning final shell executable output files only...\r
+            %__ECHO% DEL /Q sqlite3.exe sqlite3sh.pdb 2%REDIRECT% NUL\r
+          )\r
+\r
+          REM\r
+          REM NOTE: Call NMAKE with the MSVC makefile to build the "sqlite3.exe"\r
+          REM       binary.  The x86 compiler will be used to compile the native\r
+          REM       command line tools needed during the build process itself.\r
+          REM       Also, disable looking for and/or linking to the native Tcl\r
+          REM       runtime library.\r
+          REM\r
+          %__ECHO% %NMAKE_CMD% sqlite3.exe XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%\r
+\r
+          IF ERRORLEVEL 1 (\r
+            ECHO Failed to build %%B "sqlite3.exe" for platform %%P.\r
+            GOTO errors\r
+          )\r
+\r
+          REM\r
+          REM NOTE: Copy the "sqlite3.exe" file to the appropriate directory\r
+          REM       for the build and platform beneath the binary directory.\r
+          REM\r
+          %__ECHO% XCOPY sqlite3.exe "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+\r
+          IF ERRORLEVEL 1 (\r
+            ECHO Failed to copy "sqlite3.exe" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+            GOTO errors\r
+          )\r
+\r
+          REM\r
+          REM NOTE: Copy the "sqlite3sh.pdb" file to the appropriate directory\r
+          REM       for the build and platform beneath the binary directory\r
+          REM       unless we are prevented from doing so.\r
+          REM\r
+          IF NOT DEFINED NOSYMBOLS (\r
+            %__ECHO% XCOPY sqlite3sh.pdb "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+\r
+            IF ERRORLEVEL 1 (\r
+              ECHO Failed to copy "sqlite3sh.pdb" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+              GOTO errors\r
+            )\r
+          )\r
+        )\r
       )\r
     )\r
   )\r

diff --git a/tool/showdb.c b/tool/showdb.c
index 82b8c9f14f98353e6400490126f641c25d99fc77..7fdf7c91ad99eac3841806e7f814d3ab2b4bc2a7 100644 (file)
--- a/tool/showdb.c
+++ b/tool/showdb.c
@@ -375,7 +375,7 @@ static void decodeCell(
   int szPgHdr,            /* Size of the page header.  0 or 100 */
   int ofst                /* Cell begins at a[ofst] */
 ){
-  int i, j;
+  int i, j = 0;
   int leftChild;
   i64 k;
   i64 nPayload;