Also add support for EXTRA_SRC in the Makefile for MSVC.

FossilOrigin-Name: bfc18ef4323cd73fc63cb93f18bdd9c3add41bea83c1cbc1c20de5c1e4296a60

diff --git a/Makefile.msc b/Makefile.msc
index 3179e301ced35eee336bd5708690a66b5742bb2c..9b0f8c412fd3d8e26240298529b3d3d26871ac93 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -16,6 +16,10 @@ TOP = .
 !IFNDEF USE_AMALGAMATION
 USE_AMALGAMATION = 1
 !ENDIF
+
+!IFNDEF EXTRA_SRC
+EXTRA_SRC =
+!ENDIF
 # <</mark>>
 
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
@@ -1904,7 +1908,7 @@ mptest:   mptester.exe
        echo > .target_source
 
 sqlite3.c:     .target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL) src-verify.exe
-       $(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)
+       $(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS) $(EXTRA_SRC)
 
 sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl

diff --git a/manifest b/manifest
index 902e4aba7de01e4e6799560bb203bd11c1f64141..f2e0fcdcfc6e15d92f3257b441de5054484f91a8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Add\sEXTRA_SRC\sbuild\svar.\sIf\sset,\sit\sis\streated\slike\sa\slist\sof\sfiles,\seach\sof\swhich\sgets\sappended\sverbatim\sto\ssqlite3.c.\sThe\sintent\sis\sto\senable\seasily\sextending\sthe\samalgamation.\sRequested\sin/around\s[forum:3fcc655f0ac0efe8|forum\spost\s3fcc655f0ac0efe8].
-D 2023-09-02T05:37:58.754
+C Also\sadd\ssupport\sfor\sEXTRA_SRC\sin\sthe\sMakefile\sfor\sMSVC.
+D 2023-09-02T21:55:10.922
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in c0ee78a772a33c1b377eb8f8b6f456ca10ad4aee86de4c9fcd16490e7432bcdb
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 26c2d196391a285c279adb10fd6001774d9b243af94b700b681e4a49cd476684
+F Makefile.msc 4d7da1cd760e595cf751f8b3220c0b20657b20969713803ea538f66950453828
 F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
 F VERSION 4c09b629c03b8ae32317cb336a32f3aa3252841d6dcd51184cecc4278d08f21e
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -2115,11 +2115,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8ca1d815a57be1fade59fb8ea5705c27b10294e4959c8a9c624f1623df6a5f63
-R 26961792cf57fe21537a8837bc1686c0
-T *branch * extra-src
-T *sym-extra-src *
-T -sym-trunk * Cancelled\sby\sbranch.
-U stephan
-Z 89876b5c6405dcc4d6d608637f43ad0e
+P 934b84339860fa84a6faa3507bdd3cc58199e2636a394fc93176c80da0ba6f1c
+R c273c661c255a780f4edcaa61a31a00b
+U mistachkin
+Z 47e1eabb65e7f37ad8c0f6188be76f6d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f5b052c057bf47b658591796d2e17d0d8b063208..9687ff42b97a33ab29f08fb27b66b762acb052d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-934b84339860fa84a6faa3507bdd3cc58199e2636a394fc93176c80da0ba6f1c
\ No newline at end of file
+bfc18ef4323cd73fc63cb93f18bdd9c3add41bea83c1cbc1c20de5c1e4296a60
\ No newline at end of file