/ Check-in [77f7c31a]
Login

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

Overview
Comment:Sync up the MSVC autoconf makefile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:77f7c31a3aa44798cfa5f557242caffb593ce7af
User & Date: mistachkin 2016-08-24 18:21:58
Context
2016-08-25
22:06
Fix the sqlite3_trace_v2() interface so that it goes disabled if either the callback or mask arguments are zero, in accordance with the documentation. check-in: 37e6c54b user: drh tags: trunk
2016-08-24
18:49
Merge updates from trunk. check-in: 428fc38d user: mistachkin tags: callbackConv
18:21
Sync up the MSVC autoconf makefile. check-in: 77f7c31a user: mistachkin tags: trunk
2016-08-23
14:42
Fix the SQLITE_USER_AUTHENTICATION login check so that the SQLITE_AUTH_USER error code correctly propagates and is not overwritten by SQLITE_ERROR. check-in: c640489d user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    19     19   # <</mark>>
    20     20   
    21     21   # Set this non-0 to enable full warnings (-W4, etc) when compiling.
    22     22   #
    23     23   !IFNDEF USE_FULLWARN
    24     24   USE_FULLWARN = 0
    25     25   !ENDIF
           26  +
           27  +# Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
           28  +# has no effect if (any) optimizations are enabled.
           29  +#
           30  +!IFNDEF USE_RUNTIME_CHECKS
           31  +USE_RUNTIME_CHECKS = 0
           32  +!ENDIF
    26     33   
    27     34   # Set this non-0 to use "stdcall" calling convention for the core library
    28     35   # and shell executable.
    29     36   #
    30     37   !IFNDEF USE_STDCALL
    31     38   USE_STDCALL = 0
    32     39   !ENDIF
................................................................................
   831    838   
   832    839   # If optimizations are enabled or disabled (either implicitly or
   833    840   # explicitly), add the necessary flags.
   834    841   #
   835    842   !IF $(DEBUG)>1 || $(OPTIMIZATIONS)==0
   836    843   TCC = $(TCC) -Od
   837    844   BCC = $(BCC) -Od
          845  +!IF $(USE_RUNTIME_CHECKS)!=0
          846  +TCC = $(TCC) -RTC1
          847  +BCC = $(BCC) -RTC1
          848  +!ENDIF
   838    849   !ELSEIF $(OPTIMIZATIONS)>=3
   839    850   TCC = $(TCC) -Ox
   840    851   BCC = $(BCC) -Ox
   841    852   !ELSEIF $(OPTIMIZATIONS)==2
   842    853   TCC = $(TCC) -O2
   843    854   BCC = $(BCC) -O2
   844    855   !ELSEIF $(OPTIMIZATIONS)==1

Changes to autoconf/Makefile.msc.

   452    452   # also be noted here that building any target with these "stdcall" options
   453    453   # will most likely fail if the Tcl library is also required.  This is due
   454    454   # to how the Tcl library functions are declared and exported (i.e. without
   455    455   # an explicit calling convention, which results in "cdecl").
   456    456   #
   457    457   !IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
   458    458   !IF "$(PLATFORM)"=="x86"
   459         -CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
   460         -SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
          459  +CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
          460  +SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
   461    461   !ELSE
   462    462   !IFNDEF PLATFORM
   463         -CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
   464         -SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
          463  +CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
          464  +SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
   465    465   !ELSE
   466    466   CORE_CCONV_OPTS =
   467    467   SHELL_CCONV_OPTS =
   468    468   !ENDIF
   469    469   !ENDIF
   470    470   !ELSE
   471    471   CORE_CCONV_OPTS =