/ Check-in [b1dbf490]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Modify the MSVC makefile to make it easier to select the heap subsystem to use.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b1dbf490869d7fc55ce797cf80cf3bf7141d2d15
User & Date: mistachkin 2012-08-22 00:39:34
Context
2012-08-23
22:45
Merge changes for the new sqlite3_win32_set_directory API to trunk. check-in: 20f184f2 user: mistachkin tags: trunk
16:18
Further improvements to the processing of nested aggregate queries. check-in: 3c3ffa90 user: drh tags: nested-agg
2012-08-22
00:39
Modify the MSVC makefile to make it easier to select the heap subsystem to use. check-in: b1dbf490 user: mistachkin tags: trunk
2012-08-21
17:44
Update the spellfix virtual table so that all OOM errors are reported out to the application. check-in: 573770f5 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    34     34   # runtime library.
    35     35   #
    36     36   NO_TCL = 0
    37     37   
    38     38   # Set this to non-0 to create and use PDBs.
    39     39   #
    40     40   SYMBOLS = 1
           41  +
           42  +# Set this to non-0 to use the SQLite debugging heap subsystem.
           43  +#
           44  +MEMDEBUG = 0
           45  +
           46  +# Set this to non-0 to use the Win32 native heap subsystem.
           47  +#
           48  +WIN32HEAP = 0
    41     49   
    42     50   # Set this to one of the following values to enable various debugging
    43     51   # features.  Each level includes the debugging options from the previous
    44     52   # levels.  Currently, the recognized values for DEBUG are:
    45     53   #
    46     54   # 0 == NDEBUG: Disables assert() and other runtime diagnostics.
    47     55   # 1 == Disables NDEBUG and all optimizations and then enables PDBs.
................................................................................
   196    204   #
   197    205   # Prevent warnings about "deprecated" POSIX functions being used.
   198    206   #
   199    207   TCC = $(TCC) -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS
   200    208   BCC = $(BCC) -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS
   201    209   
   202    210   #
   203         -# Use native Win32 heap instead of malloc/free?
          211  +# Use the SQLite debugging heap subsystem?
   204    212   #
   205         -# TCC = $(TCC) -DSQLITE_WIN32_MALLOC=1
          213  +!IF $(MEMDEBUG)!=0
          214  +TCC = $(TCC) -DSQLITE_MEMDEBUG=1
          215  +
          216  +#
          217  +# Use native Win32 heap subsystem instead of malloc/free?
          218  +#
          219  +!ELSEIF $(WIN32HEAP)!=0
          220  +TCC = $(TCC) -DSQLITE_WIN32_MALLOC=1
   206    221   
   207    222   #
   208    223   # Validate the heap on every call into the native Win32 heap subsystem?
   209    224   #
   210    225   !IF $(DEBUG)>2
   211    226   TCC = $(TCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1
          227  +!ENDIF
   212    228   !ENDIF
   213    229   
   214    230   # The locations of the Tcl header and library files.  Also, the library that
   215    231   # non-stubs enabled programs using Tcl must link against.  These variables
   216    232   # (TCLINCDIR, TCLLIBDIR, and LIBTCL) may be overridden via the environment
   217    233   # prior to running nmake in order to match the actual installed location and
   218    234   # version on this machine.