Enhance Makefile for MSVC to support building the shell tool without using the amalga...

FossilOrigin-Name: 3d815d83a6805938b87e03ffabe6d71ca2ecfd05052e8e02c6cc5d3c9ea4ddf3

diff --git a/Makefile.msc b/Makefile.msc
index e423631feaad26836acd1358500151538e9ff6f3..17c04af1008e404639bd035afb6e250cc89a97c3 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -620,6 +620,10 @@ SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS)
 !IFNDEF SHELL_CORE_SRC
 !IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
 SHELL_CORE_SRC =
+# <<mark>>
+!ELSEIF $(USE_AMALGAMATION)==0
+SHELL_CORE_SRC =
+# <</mark>>
 !ELSE
 SHELL_CORE_SRC = $(SQLITE3C)
 !ENDIF
@@ -630,6 +634,10 @@ SHELL_CORE_SRC = $(SQLITE3C)
 !IFNDEF SHELL_CORE_DEP
 !IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
 SHELL_CORE_DEP = $(SQLITE3DLL)
+# <<mark>>
+!ELSEIF $(USE_AMALGAMATION)==0
+SHELL_CORE_DEP = libsqlite3.lib
+# <</mark>>
 !ELSE
 SHELL_CORE_DEP =
 !ENDIF
@@ -649,6 +657,10 @@ TESTFIXTURE_DEP = zlib $(TESTFIXTURE_DEP)
 !IFNDEF SHELL_CORE_LIB
 !IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
 SHELL_CORE_LIB = $(SQLITE3LIB)
+# <<mark>>
+!ELSEIF $(USE_AMALGAMATION)==0
+SHELL_CORE_LIB = libsqlite3.lib
+# <</mark>>
 !ELSE
 SHELL_CORE_LIB =
 !ENDIF
@@ -1697,8 +1709,8 @@ scrub.exe:        $(TOP)\ext\misc\scrub.c $(SQLITE3C) $(SQLITE3H)
 srcck1.exe:    $(TOP)\tool\srcck1.c
        $(BCC) $(NO_WARN) -Fe$@ $(TOP)\tool\srcck1.c
 
-sourcetest:    srcck1.exe sqlite3.c
-       srcck1.exe sqlite3.c
+sourcetest:    srcck1.exe $(SQLITE3C)
+       srcck1.exe $(SQLITE3C)
 
 fuzzershell.exe:       $(TOP)\tool\fuzzershell.c $(SQLITE3C) $(SQLITE3H)
        $(LTLINK) $(NO_WARN) $(FUZZERSHELL_COMPILE_OPTS) $(TOP)\tool\fuzzershell.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@@ -2455,7 +2467,6 @@ clean:
        del /Q *.bsc *.def *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
        del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL
 # <<mark>>
-       del /Q sqlite3.c sqlite3.h 2>NUL
        del /Q opcodes.c opcodes.h 2>NUL
        del /Q lemon.* lempar.c parse.* 2>NUL
        del /Q mksourceid.* mkkeywordhash.* keywordhash.h 2>NUL
@@ -2472,7 +2483,7 @@ clean:
        del /Q changeset.exe 2>NUL
        del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe 2>NUL
        del /Q mptester.exe wordcount.exe rbu.exe srcck1.exe 2>NUL
-       del /Q sqlite3.c sqlite3-*.c 2>NUL
+       del /Q sqlite3.c sqlite3-*.c sqlite3.h 2>NUL
        del /Q sqlite3rc.h 2>NUL
        del /Q shell.c sqlite3ext.h sqlite3session.h 2>NUL
        del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL

diff --git a/manifest b/manifest
index 1818ff4bbd0a922f82117ec1e9a783bb5b611bd9..ddb0ba8ef0497e40a524ddc4c578bd24f305815e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C The\sWHERE-clause\sconstant\spropagation\soptimization\sattempts\sto\suse\ntransitive\slaws\sto\sreplace\scolumn\svalues\swith\sconstants\sin\sthe\sWHERE\nclause\sin\sorder\sto\shelp\sto\squery\splanner\smake\smore\saggressive\soptimizations.
-D 2018-07-27T20:37:42.265
+C Enhance\sMakefile\sfor\sMSVC\sto\ssupport\sbuilding\sthe\sshell\stool\swithout\susing\sthe\samalgamation.
+D 2018-07-27T20:45:28.697
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc c1646e8f86c30ea63e56176deacef192ac87c663ce2c9083f459c45a7268934f
+F Makefile.msc 91d78669ce4a4267d6988d16b0bde831ea207e3a2e488efcba558a70dfa45a72
 F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
 F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1753,8 +1753,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 22f47cf430827c50634794a5a33987511bb71492c0dd1f6466a0c5b779d0521b 865249de683e6971984a645a30d96f9fcc6f6d9d7af7e269ff68cc3e42e5fe71
-R 689982bf0de4818ecef4897183e8c441
-T +closed 865249de683e6971984a645a30d96f9fcc6f6d9d7af7e269ff68cc3e42e5fe71
-U drh
-Z ad17e846b7bdfa92b5025758f4a66673
+P f4229707ac08d66c5b0f53483ce17a63f5ac40a21922f66c3408e1b6fda3a7c2
+R 464c2ff9b3e195b7b1100f9454773c91
+U mistachkin
+Z e7898633f0a206319f76d54e6b9d0ac3

diff --git a/manifest.uuid b/manifest.uuid
index 7429c37b4a1d5bf1e6115d2aeb13ccb16361c8b4..ff2eae2a86d575dbf9aa5a2403d049cc85cfc1a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4229707ac08d66c5b0f53483ce17a63f5ac40a21922f66c3408e1b6fda3a7c2
\ No newline at end of file
+3d815d83a6805938b87e03ffabe6d71ca2ecfd05052e8e02c6cc5d3c9ea4ddf3
\ No newline at end of file