Merge build tool updates from trunk. Also, modify MSVC makefile to allow for debuggi...

FossilOrigin-Name: b2a2fdb0ac8d27efe3036fc49941279e24de6211

diff --cc Makefile.msc
index a09bd955f55fd8f00587c6fd8b963283e54543d0,2d8f44c7332ca16397b261ea2a2500e99e87960b..2517a37bceeff42c1b7e8ad4acf51ac62abda78e
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -41,7 -35,13 +41,7 @@@ DEBUG = 
  # C Compiler and options for use in building executables that
  # will run on the platform that is doing the build.
  #
--BCC = cl.exe
++BCC = cl.exe -W3
  
  # C Compile and options for use in building executables that
  # will run on the target platform.  (BCC and TCC are usually the
@@@ -75,6 -64,6 +75,7 @@@ TCC = $(TCC) -I$(TOP)\ext\rtre
  #
  !IF $(DEBUG)==0
  TCC = $(TCC) -DNDEBUG
++BCC = $(BCC) -DNDEBUG
  !ENDIF
  
  !IF $(DEBUG)>1
@@@ -93,6 -82,6 +94,7 @@@ TCC = $(TCC) -DSQLITE_ENABLE_IOTRAC
  # Prevent warnings about "insecure" runtime library functions being used.
  #
  TCC = $(TCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS
++BCC = $(BCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS
  
  #
  # Use native Win32 heap instead of malloc/free?
@@@ -205,12 -194,12 +207,15 @@@ TCC = $(TCC) $(OPTS
  # If debugging is enabled, disable all optimizations and enable PDBs.
  !IF $(DEBUG)>0
  TCC = $(TCC) -Od -D_DEBUG
++BCC = $(BCC) -Od -D_DEBUG
  !ELSE
  TCC = $(TCC) -O2
++BCC = $(BCC) -O2
  !ENDIF
  
  !IF $(DEBUG)>0 || $(SYMBOLS)!=0
  TCC = $(TCC) -Zi
++BCC = $(BCC) -Zi
  !ENDIF
  
  # If ICU support is enabled, add the compiler options for it.
@@@ -234,17 -223,9 +239,18 @@@ LTLINKOPTS = /MACHINE:$(PLATFORM
  LTLIBOPTS = /MACHINE:$(PLATFORM)
  !ENDIF
  
 -# If debugging is enabled, enable PDBs.
 +# When compiling for use in the WinRT environment, the following
 +# linker option must be used to mark the executable as runnable
 +# only in the context of an application container.
 +#
 +!IF $(FOR_WINRT)!=0
 +LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
 +!ENDIF
 +
- # If debugging is enabled, enable PDBs.
++# If either debugging or symbols are enabled, enable PDBs.
  !IF $(DEBUG)>0 || $(SYMBOLS)!=0
  LTLINKOPTS = $(LTLINKOPTS) /DEBUG
++BCC = $(BCC) /DEBUG
  !ENDIF
  
  # Start with the Tcl related linker options.

diff --cc manifest
index 3361895e4ae5ed4580d0948745c9fb4dc734fbc8,3fe3810d0ee145c45c00805c77ec49813b3a35cc..f20d6b64ed2b391d7db01d84ecb74ec7e8a7a6e0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Import\sall\sthe\slatest\strunk\schanges\sinto\sthe\sWinRT\sbranch.\s\sRefactor\sand/or\sremove\sWinCE-specific\smacros\sand\sfunctions\sused\sfor\sfile\slocking\sto\simprove\sclarity\sof\spresentation.
- D 2012-04-18T05:57:38.819
 -C Fix\sa\sharmless\scompiler\swarning\sin\sthe\smkkeywordhash.c\sutility\sprogram.
 -D 2012-04-18T10:13:20.705
++C Merge\sbuild\stool\supdates\sfrom\strunk.\s\sAlso,\smodify\sMSVC\smakefile\sto\sallow\sfor\sdebugging\sof\sbuild\stool\sissues.
++D 2012-04-18T10:29:21.047
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 71b1e756a0afe19fd6ef2b1e60bf2135118ed4d5
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
++F Makefile.msc f1450260e62a44bdd5fbb4f11389505167188df9
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f9313d88cb77df8617059a88eb382291321ef6bc
@@@ -1000,7 -1000,7 +1000,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 300bcfe31102d4428567d56810b57d1d54c1d43b 430bb59d798286a86c351de92c429345f016b3f0
- R f8499f4b4cfea9459167b2ec1c6f0e24
 -P 4a5641cc0aa4c49762f4fe73dab4a6612631c0d2
 -R 9331d8fd78cc0caf6b6610e6acb41aab
 -U drh
 -Z a487d3c4edeae5b06a7f847c65e40582
++P ad5cd15f49b286896f94ab1ff207077beee40e12 6015200beb3be7ec141ce36de694278e3ba11a02
++R f7f672d0d1f7d8f661126d329aacae85
 +U mistachkin
- Z c68bf45e8579755b27c882f840c88e2c
++Z 5f8778fd5913269d27b5a934d131dc8a

diff --cc manifest.uuid
index 52453a246bfd99f448b5339cf9e27cfa6b346a01,b3be873e6baad005fe8492b3fd071284e2e45e44..c546007877c9152179340eab66398c676cecc96a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ad5cd15f49b286896f94ab1ff207077beee40e12
 -6015200beb3be7ec141ce36de694278e3ba11a02
++b2a2fdb0ac8d27efe3036fc49941279e24de6211