Enhancements to the MSVC makefile.

FossilOrigin-Name: 39e8a5d93fa370afb03223bf0c20ea0f3448b9fc

diff --git a/Makefile.msc b/Makefile.msc
index f0da4797610badc788e3f80f427f9d02db75984b..63fbfad6ca4802fe3d4d47b767fced9c165689ee 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -292,9 +292,9 @@ NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 # will run on the platform that is doing the build.
 #
 !IF $(USE_FULLWARN)!=0
-BCC = $(NCC) -nologo -W4
+BCC = $(NCC) -nologo -W4 $(CCOPTS) $(BCCOPTS)
 !ELSE
-BCC = $(NCC) -nologo -W3
+BCC = $(NCC) -nologo -W3 $(CCOPTS) $(BCCOPTS)
 !ENDIF
 
 # Check if assembly code listings should be generated for the source
@@ -322,13 +322,13 @@ NLTLIBPATHS = $(NLTLIBPATHS) "/LIBPATH:$(NUCRTLIBPATH)"
 # same unless your are cross-compiling.)
 #
 !IF $(USE_FULLWARN)!=0
-TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1
+TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS)
 !ELSE
-TCC = $(CC) -nologo -W3
+TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !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
+RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
 
 # 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
@@ -800,7 +800,9 @@ LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(PSDKLIBPATH)"
 # If either debugging or symbols are enabled, enable PDBs.
 #
 !IF $(DEBUG)>1 || $(SYMBOLS)!=0
-LDFLAGS = /DEBUG
+LDFLAGS = /DEBUG $(LDOPTS)
+!ELSE
+LDFLAGS = $(LDOPTS)
 !ENDIF
 
 # Start with the Tcl related linker options.

diff --git a/manifest b/manifest
index 12ac2dfae95e6dbbc436774cf51b85fab953b3b2..d339fd779d396affc5e3544ba3ba332c689d74f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Merge\sthe\s3.9.1\schanges\sinto\strunk.\s\s(This\sonly\supdates\sthe\sversion\snumber\nand\sconfigure\sscript\ssince\sall\sthe\sother\schanges\sin\s3.9.1\swere\scherrypicked\nfrom\strunk.)
-D 2015-10-16T20:12:12.471
+C Enhancements\sto\sthe\sMSVC\smakefile.
+D 2015-10-16T20:13:57.036
 F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 8e42cb55739cd8c12e1fd25401956e2019448f6a
+F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1391,7 +1391,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d6fc616e4c8a024f71a044e61f0493dea7d9c812 767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
-R 18e9c8e6d6f6d791d021b8710d206185
-U drh
-Z ab2147dc71d13d5bd253718a8a6d171b
+P eb2317429fc3fc81ccd92e6f84f873585829259d
+R c8195ddfd54e61d102ea2ab84cfcbce4
+U mistachkin
+Z 0b9815ef53884597c48f7e60955b08c9

diff --git a/manifest.uuid b/manifest.uuid
index a9dc7fd9dea6deb76ae80a2203f05b52ef7ed22a..2d3dfc6c5df22dafffe1b75c97e62d28ea79b40c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eb2317429fc3fc81ccd92e6f84f873585829259d
\ No newline at end of file
+39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
\ No newline at end of file