/ Check-in [40c417a7]
Login

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

Overview
Comment:Minor build enhancements for MSVC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 40c417a7efb17221cec4a0a703863854bcab8db2
User & Date: mistachkin 2015-04-10 21:16:11
Context
2015-04-11
02:08
Detect and report oversized records constructed from multiple zeroblobs. check-in: 9e139afd user: drh tags: trunk
2015-04-10
21:16
Minor build enhancements for MSVC. check-in: 40c417a7 user: mistachkin tags: trunk
16:05
In sqlite3_declare_vtab(), avoid accessing the database structure until after the "api-armour" safety-check has completed and the db mutex has been obtained. check-in: 860e4f8a user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    38     38   
    39     39   # If necessary, create a list of harmless compiler warnings to disable when
    40     40   # compiling the various tools.  For the SQLite source code itself, warnings,
    41     41   # if any, will be disabled from within it.
    42     42   #
    43     43   !IFNDEF NO_WARN
    44     44   !IF $(USE_FULLWARN)!=0
    45         -NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4152 -wd4189 -wd4206 -wd4210
    46         -NO_WARN = $(NO_WARN) -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
           45  +NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206
           46  +NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
    47     47   !ENDIF
    48     48   !ENDIF
    49     49   
    50     50   # Set this non-0 to use the library paths and other options necessary for
    51     51   # Windows Phone 8.1.
    52     52   #
    53     53   !IFNDEF USE_WP81_OPTS
................................................................................
   449    449   !ENDIF
   450    450   
   451    451   # The mksqlite3c.tcl script accepts some options on the command
   452    452   # line.  When compiling with debugging enabled, some of these
   453    453   # options are necessary in order to allow debugging symbols to
   454    454   # work correctly with Visual Studio when using the amalgamation.
   455    455   #
          456  +!IFNDEF MKSQLITE3C_ARGS
   456    457   !IF $(DEBUG)>1
   457    458   MKSQLITE3C_ARGS = --linemacros
   458    459   !ELSE
   459    460   MKSQLITE3C_ARGS =
          461  +!ENDIF
   460    462   !ENDIF
   461    463   
   462    464   # Define -DNDEBUG to compile without debugging (i.e., for production usage)
   463    465   # Omitting the define will cause extra debugging code to be inserted and
   464    466   # includes extra comments when "EXPLAIN stmt" is used.
   465    467   #
   466    468   !IF $(DEBUG)==0

Changes to src/msvc.h.

    16     16   #define _MSVC_H_
    17     17   
    18     18   #if defined(_MSC_VER)
    19     19   #pragma warning(disable : 4054)
    20     20   #pragma warning(disable : 4055)
    21     21   #pragma warning(disable : 4100)
    22     22   #pragma warning(disable : 4127)
           23  +#pragma warning(disable : 4130)
    23     24   #pragma warning(disable : 4152)
    24     25   #pragma warning(disable : 4189)
    25     26   #pragma warning(disable : 4206)
    26     27   #pragma warning(disable : 4210)
    27     28   #pragma warning(disable : 4232)
    28     29   #pragma warning(disable : 4244)
    29     30   #pragma warning(disable : 4305)
    30     31   #pragma warning(disable : 4306)
    31     32   #pragma warning(disable : 4702)
    32     33   #pragma warning(disable : 4706)
    33     34   #endif /* defined(_MSC_VER) */
    34     35   
    35     36   #endif /* _MSVC_H_ */