Enhancements to the MSVC makefile.

FossilOrigin-Name: 59e3e9e764440b7feaafadff74f422535d21bca2

diff --git a/Makefile.msc b/Makefile.msc
index 487d85bfc7a21ea5bfb771604e5c655646f9c185..cd39e48ab9086a8e3420ae0c3b0555fe83a479c3 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -36,6 +36,13 @@ USE_STDCALL = 0
 DYNAMIC_SHELL = 0
 !ENDIF
 
+# Set this non-0 to enable extra code that attempts to detect misuse of the
+# SQLite API.
+#
+!IFNDEF API_ARMOR
+API_ARMOR = 0
+!ENDIF
+
 # If necessary, create a list of harmless compiler warnings to disable when
 # compiling the various tools.  For the SQLite source code itself, warnings,
 # if any, will be disabled from within it.
@@ -491,14 +498,14 @@ BCC = $(BCC) -DNDEBUG
 RCC = $(RCC) -DNDEBUG
 !ENDIF
 
-!IF $(DEBUG)>0
-TCC = $(TCC) -DSQLITE_ENABLE_API_ARMOR
-RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR
+!IF $(DEBUG)>0 || $(API_ARMOR)!=0
+TCC = $(TCC) -DSQLITE_ENABLE_API_ARMOR=1
+RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 !ENDIF
 
 !IF $(DEBUG)>2
-TCC = $(TCC) -DSQLITE_DEBUG
-RCC = $(RCC) -DSQLITE_DEBUG
+TCC = $(TCC) -DSQLITE_DEBUG=1
+RCC = $(RCC) -DSQLITE_DEBUG=1
 !ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
@@ -507,8 +514,8 @@ RCC = $(RCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
 !ENDIF
 
 !IF $(DEBUG)>5
-TCC = $(TCC) -DSQLITE_ENABLE_IOTRACE
-RCC = $(RCC) -DSQLITE_ENABLE_IOTRACE
+TCC = $(TCC) -DSQLITE_ENABLE_IOTRACE=1
+RCC = $(RCC) -DSQLITE_ENABLE_IOTRACE=1
 !ENDIF
 
 # Prevent warnings about "insecure" MSVC runtime library functions

diff --git a/manifest b/manifest
index fd76aff3334e2935abbeab107cc161175e8ff89f..0c5a5294e3b04b9bc7259cf3c60a13ee83cb8756 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\stypo\sin\sWin32\sVFS\scode\senabled\swhen\sthe\sSQLITE_WIN32_USE_UUID\scompile-time\soption\sis\sused.
-D 2015-05-12T19:53:15.308
+C Enhancements\sto\sthe\sMSVC\smakefile.
+D 2015-05-13T04:50:30.732
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc c65882433fde5f35ff66e759938eaf2dde9f360d
+F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
@@ -1258,7 +1258,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 c3cbe3b06eb37b9949c5fcb0e257a845953de7a7
-R f8a1a5e41ff600c683edb344c8800a3a
+P b33f1bacfdb34fe66b7b073e68bfac38498d6e88
+R 786cf9bafb843a30daaea508385a36b1
 U mistachkin
-Z 79fe1e789aa3c85e03551f9de21569c5
+Z cf0d8cd171ac487c0fd87c289759c254

diff --git a/manifest.uuid b/manifest.uuid
index 1a0c68cb9fcc73a79cb9051fd047f13d2173a0c6..af09740391caad5f8097efb6a468eab85473077d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b33f1bacfdb34fe66b7b073e68bfac38498d6e88
\ No newline at end of file
+59e3e9e764440b7feaafadff74f422535d21bca2
\ No newline at end of file