Enhance the MSVC makefile for better debugging symbol support.

FossilOrigin-Name: c723ec2784d6b60c9781a435c84800b2bc7818d5

diff --git a/Makefile.msc b/Makefile.msc
index 94cd38d0ae9d16f13153d20b9152ae810639b51a..8dce52b5bc7c29e6fa0a4b4c82f2b03b04fa5bb8 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -270,6 +270,17 @@ TCC = $(TCC) -I$(TOP)\ext\rtree
 RCC = $(RCC) -I$(TOP)\ext\rtree
 !ENDIF
 
+# The mksqlite3c.tcl script accepts some options on the command
+# line.  When compiling with debugging enabled, some of these
+# options are necessary in order to allow debugging symbols to
+# work correctly with Visual Studio when using the amalgamation.
+#
+!IF $(DEBUG)>0
+MKSQLITE3C_ARGS = --linemacros
+!ELSE
+MKSQLITE3C_ARGS =
+!ENDIF
+
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
 # Omitting the define will cause extra debugging code to be inserted and
 # includes extra comments when "EXPLAIN stmt" is used.
@@ -916,7 +927,7 @@ mptester.exe:       $(TOP)\mptest\mptest.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
        echo > .target_source
 
 sqlite3.c:     .target_source $(TOP)\tool\mksqlite3c.tcl
-       $(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
+       $(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl $(MKSQLITE3C_ARGS)
        copy tsrc\shell.c .
        copy tsrc\sqlite3ext.h .
 
@@ -1334,17 +1345,17 @@ sqlite3_analyzer.exe:   sqlite3_analyzer.c $(LIBRESOBJS)
        $(LTLINK) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
                /link $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
-showdb.exe:    $(TOP)\tool\showdb.c sqlite3.c
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
-               $(TOP)\tool\showdb.c sqlite3.c
+showdb.exe:    $(TOP)\tool\showdb.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\tool\showdb.c $(SQLITE3C)
 
-wordcount.exe: $(TOP)\test\wordcount.c sqlite3.c
-       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
-               $(TOP)\test\wordcount.c sqlite3.c
+wordcount.exe: $(TOP)\test\wordcount.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\test\wordcount.c $(SQLITE3C)
 
-speedtest1.exe:        $(TOP)\test\speedtest1.c sqlite3.c
-       $(LTLINK) -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
-               $(TOP)\test\speedtest1.c sqlite3.c
+speedtest1.exe:        $(TOP)\test\speedtest1.c $(SQLITE3C)
+       $(LTLINK) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
+               $(TOP)\test\speedtest1.c $(SQLITE3C)
 
 clean:
        del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib

diff --git a/manifest b/manifest
index 1cd51063f2fb3671afcad2dad27d227a740f3d91..c7699c04b58d963dd0b0a8a8dc7c81f8eff202be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Make\ssure\sthat\ssqlite3SelectDup()\sinitializes\sthe\snSelectRow\sof\sthe\nduplicate\sSelect\sobject.
-D 2014-01-29T01:46:12.389
+C Enhance\sthe\sMSVC\smakefile\sfor\sbetter\sdebugging\ssymbol\ssupport.
+D 2014-01-30T11:12:52.221
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4d4ead6b71d1bf03028fbd61da0ba0ec5e1556e1
+F Makefile.msc 6ff3ff2eef45c7dd309a8626ff7947b20bd387e7
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
@@ -1152,7 +1152,10 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 27c27daa3324b7c9323acfb972330367630bb64e
-R f049cadfe79d3cfbcc34d51b06338c39
-U drh
-Z 40ce23bc9f3b9d3c5fa7bebae22e1b10
+P 5bb29b82109224a2ad02920658fabd8fb0f27b3f
+R e0401798681e1755ee5c5e2fa367c3e2
+T *branch * msvcDebug
+T *sym-msvcDebug *
+T -sym-trunk *
+U mistachkin
+Z 7b0fb43b6887cb799be56b64c1e1c153

diff --git a/manifest.uuid b/manifest.uuid
index a9b235c6f07898da19407b391a8f681ab2c9d634..3ede51f5277548df25f94d69924786107fc1cd5f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bb29b82109224a2ad02920658fabd8fb0f27b3f
\ No newline at end of file
+c723ec2784d6b60c9781a435c84800b2bc7818d5
\ No newline at end of file