/ Check-in [abb112d9]
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:Fix compilation of 'sqltclsh.exe' for MSVC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: abb112d9e1a51c1c2f15d1e5f3dc161c9a947841f69a56715f5f1c62603096b2
User & Date: mistachkin 2018-01-08 14:24:08
Context
2018-01-08
17:05
Fix a malloc/sqlite3_free mismatch in the shell tool code. check-in: fe053b2e user: dan tags: trunk
14:24
Fix compilation of 'sqltclsh.exe' for MSVC. check-in: abb112d9 user: mistachkin tags: trunk
2018-01-07
23:28
Avoid the use of utimensat() on older unix platforms. check-in: 90cb01d8 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  2335   2335   sqlite3_analyzer.exe:	sqlite3_analyzer.c $(LIBRESOBJS)
  2336   2336   	$(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqlite3_analyzer.c \
  2337   2337   		/link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
  2338   2338   
  2339   2339   sqltclsh.c: sqlite3.c $(TOP)\src\tclsqlite.c $(TOP)\tool\sqltclsh.tcl $(TOP)\ext\misc\appendvfs.c $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqltclsh.c.in
  2340   2340   	$(TCLSH_CMD) $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqltclsh.c.in >sqltclsh.c
  2341   2341   
  2342         -sqltclsh.exe: sqltclsh.c
         2342  +sqltclsh.exe: sqltclsh.c  $(SHELL_CORE_DEP) $(LIBRESOBJS)
  2343   2343   	$(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqltclsh.c \
  2344   2344   		/link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
  2345   2345   
  2346   2346   sqlite3_expert.exe: $(SQLITE3C) $(TOP)\ext\expert\sqlite3expert.h $(TOP)\ext\expert\sqlite3expert.c $(TOP)\ext\expert\expert.c
  2347   2347   	$(LTLINK) $(NO_WARN)	$(TOP)\ext\expert\sqlite3expert.c $(TOP)\ext\expert\expert.c $(SQLITE3C) $(TLIBS)
  2348   2348   
  2349   2349   CHECKER_DEPS =\

Changes to tool/sqltclsh.c.in.

    25     25   #define SQLITE_OMIT_DEPRECATED 1
    26     26   #define SQLITE_OMIT_PROGRESS_CALLBACK 1
    27     27   #define SQLITE_OMIT_SHARED_CACHE 1
    28     28   #define SQLITE_DEFAULT_MEMSTATUS 0
    29     29   #define SQLITE_MAX_EXPR_DEPTH 0
    30     30   INCLUDE sqlite3.c
    31     31   INCLUDE $ROOT/ext/misc/appendvfs.c
           32  +#ifdef SQLITE_HAVE_ZLIB
    32     33   INCLUDE $ROOT/ext/misc/zipfile.c
    33     34   INCLUDE $ROOT/ext/misc/sqlar.c
           35  +#endif
    34     36   INCLUDE $ROOT/src/tclsqlite.c
    35     37   
    36     38   const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
    37     39     (void)interp;
    38     40     sqlite3_appendvfs_init(0,0,0);
           41  +#ifdef SQLITE_HAVE_ZLIB
    39     42     sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
    40     43     sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
           44  +#endif
    41     45   
    42     46     return
    43     47   BEGIN_STRING
    44     48   INCLUDE $ROOT/tool/sqltclsh.tcl
    45     49   END_STRING
    46     50   ;
    47     51   }