Fossil SCM

Align recommended SQLite compilation options with actual options used when compiling SQLite. (I don't think SQLITE_ENABLE_EXPLAIN_COMMENTS should be one of them, it never was in earlier releases)

jan.nijtmans 2013-12-17 11:56 win32-longpath
Commit d0814e59e2354c1d11845765d2387415a42c1a76
Parent 5ceef9bcdd88b77…
9 files changed +4 -5 +3 -3 +1 -1 +1 -1 +3 -4 +3 -4 +5 -6 +1 -1
~ src/main.mk ~ src/makemake.tcl ~ test/win32-longpath.test ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/makefile.wiki
M src/main.mk
+4 -5
--- src/main.mk
+++ src/main.mk
@@ -376,17 +376,16 @@
376376
377377
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378378
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379379
380380
 # Setup the options used to compile the included SQLite library.
381
-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
381
+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
383
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
382384
 -DSQLITE_THREADSAFE=0 \
383385
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
384
- -DSQLITE_OMIT_DEPRECATED \
385
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
386
- -Dlocaltime=fossil_localtime \
387
- -DSQLITE_ENABLE_LOCKING_STYLE=0
386
+ -DSQLITE_OMIT_DEPRECATED
388387
389388
 # Setup the options used to compile the included SQLite shell.
390389
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
391390
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
392391
 -Dsqlite3_strglob=strglob
393392
--- src/main.mk
+++ src/main.mk
@@ -376,17 +376,16 @@
376
377 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
380 # Setup the options used to compile the included SQLite library.
381 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
 
382 -DSQLITE_THREADSAFE=0 \
383 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
384 -DSQLITE_OMIT_DEPRECATED \
385 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
386 -Dlocaltime=fossil_localtime \
387 -DSQLITE_ENABLE_LOCKING_STYLE=0
388
389 # Setup the options used to compile the included SQLite shell.
390 SHELL_OPTIONS = -Dmain=sqlite3_shell \
391 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
392 -Dsqlite3_strglob=strglob
393
--- src/main.mk
+++ src/main.mk
@@ -376,17 +376,16 @@
376
377 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
380 # Setup the options used to compile the included SQLite library.
381 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
383 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
384 -DSQLITE_THREADSAFE=0 \
385 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
386 -DSQLITE_OMIT_DEPRECATED
 
 
 
387
388 # Setup the options used to compile the included SQLite shell.
389 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391 -Dsqlite3_strglob=strglob
392
M src/makemake.tcl
+3 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -129,18 +129,18 @@
129129
 }
130130
131131
 # Options used to compile the included SQLite library.
132132
 #
133133
 set SQLITE_OPTIONS {
134
+ -Dlocaltime=fossil_localtime
134135
 -DSQLITE_OMIT_LOAD_EXTENSION=1
136
+ -DSQLITE_ENABLE_LOCKING_STYLE=0
135137
 -DSQLITE_THREADSAFE=0
136138
 -DSQLITE_DEFAULT_FILE_FORMAT=4
137139
 -DSQLITE_OMIT_DEPRECATED
138
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS
139
- -Dlocaltime=fossil_localtime
140
- -DSQLITE_ENABLE_LOCKING_STYLE=0
141140
 }
141
+#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142142
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143143
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144144
 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145145
 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
146146
147147
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -129,18 +129,18 @@
129 }
130
131 # Options used to compile the included SQLite library.
132 #
133 set SQLITE_OPTIONS {
 
134 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
135 -DSQLITE_THREADSAFE=0
136 -DSQLITE_DEFAULT_FILE_FORMAT=4
137 -DSQLITE_OMIT_DEPRECATED
138 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
139 -Dlocaltime=fossil_localtime
140 -DSQLITE_ENABLE_LOCKING_STYLE=0
141 }
 
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
146
147
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -129,18 +129,18 @@
129 }
130
131 # Options used to compile the included SQLite library.
132 #
133 set SQLITE_OPTIONS {
134 -Dlocaltime=fossil_localtime
135 -DSQLITE_OMIT_LOAD_EXTENSION=1
136 -DSQLITE_ENABLE_LOCKING_STYLE=0
137 -DSQLITE_THREADSAFE=0
138 -DSQLITE_DEFAULT_FILE_FORMAT=4
139 -DSQLITE_OMIT_DEPRECATED
 
 
 
140 }
141 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
146
147
M test/win32-longpath.test

No diff available

M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
8383
8484
 # define the sqlite files, which need special flags on compile
8585
 SQLITESRC=sqlite3.c
8686
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
8787
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88
-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
88
+SQLITEDEFINES=-Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
9494
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,11 +24,11 @@
2424
 CFLAGS = -o
2525
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
2828
29
-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
29
+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
3030
3131
 SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
3232
3333
 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
3434
3535
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,11 +24,11 @@
24 CFLAGS = -o
25 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
30
31 SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,11 +24,11 @@
24 CFLAGS = -o
25 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
30
31 SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35
M win/Makefile.mingw
+3 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1698,17 +1698,16 @@
16981698
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
16991699
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
17001700
17011701
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
17021702
1703
-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1703
+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17041706
 -DSQLITE_THREADSAFE=0 \
17051707
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17061708
 -DSQLITE_OMIT_DEPRECATED \
1707
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708
- -Dlocaltime=fossil_localtime \
1709
- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17101709
 -D_HAVE_SQLITE_CONFIG_H \
17111710
 -DSQLITE_USE_MALLOC_H \
17121711
 -DSQLITE_USE_MSIZE
17131712
17141713
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17151714
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1698,17 +1698,16 @@
1698 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
 
1704 -DSQLITE_THREADSAFE=0 \
1705 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706 -DSQLITE_OMIT_DEPRECATED \
1707 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708 -Dlocaltime=fossil_localtime \
1709 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1698,17 +1698,16 @@
1698 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
 
 
 
1709 -D_HAVE_SQLITE_CONFIG_H \
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714
M win/Makefile.mingw.mistachkin
+3 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1698,17 +1698,16 @@
16981698
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
16991699
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
17001700
17011701
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
17021702
1703
-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1703
+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17041706
 -DSQLITE_THREADSAFE=0 \
17051707
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17061708
 -DSQLITE_OMIT_DEPRECATED \
1707
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708
- -Dlocaltime=fossil_localtime \
1709
- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17101709
 -D_HAVE_SQLITE_CONFIG_H \
17111710
 -DSQLITE_USE_MALLOC_H \
17121711
 -DSQLITE_USE_MSIZE
17131712
17141713
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17151714
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1698,17 +1698,16 @@
1698 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
 
1704 -DSQLITE_THREADSAFE=0 \
1705 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706 -DSQLITE_OMIT_DEPRECATED \
1707 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708 -Dlocaltime=fossil_localtime \
1709 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1698,17 +1698,16 @@
1698 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
 
 
 
1709 -D_HAVE_SQLITE_CONFIG_H \
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714
M win/Makefile.msc
+5 -6
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -39,11 +39,11 @@
3939
 !ifdef FOSSIL_ENABLE_SSL
4040
 INCL = $(INCL) -I$(SSLINCDIR)
4141
 !endif
4242
4343
 CFLAGS = -nologo -MT -O2
44
-LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
44
+LDFLAGS = /NODEFAULTLIB:msvcrt
4545
4646
 !ifdef DEBUG
4747
 CFLAGS = $(CFLAGS) -Zi
4848
 LDFLAGS = $(LDFLAGS) /DEBUG
4949
 !endif
@@ -64,17 +64,16 @@
6464
 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
6565
 LIBS = $(LIBS) $(SSLLIB)
6666
 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
6767
 !endif
6868
69
-SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
69
+SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
70
+ /DSQLITE_OMIT_LOAD_EXTENSION=1 \
71
+ /DSQLITE_ENABLE_LOCKING_STYLE=0 \
7072
 /DSQLITE_THREADSAFE=0 \
7173
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
72
- /DSQLITE_OMIT_DEPRECATED \
73
- /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74
- /Dlocaltime=fossil_localtime \
75
- /DSQLITE_ENABLE_LOCKING_STYLE=0
74
+ /DSQLITE_OMIT_DEPRECATED
7675
7776
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
7877
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
7978
 /Dsqlite3_strglob=strglob \
8079
 /Dgetenv=fossil_getenv \
8180
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -39,11 +39,11 @@
39 !ifdef FOSSIL_ENABLE_SSL
40 INCL = $(INCL) -I$(SSLINCDIR)
41 !endif
42
43 CFLAGS = -nologo -MT -O2
44 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
45
46 !ifdef DEBUG
47 CFLAGS = $(CFLAGS) -Zi
48 LDFLAGS = $(LDFLAGS) /DEBUG
49 !endif
@@ -64,17 +64,16 @@
64 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65 LIBS = $(LIBS) $(SSLLIB)
66 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
67 !endif
68
69 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
 
70 /DSQLITE_THREADSAFE=0 \
71 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
72 /DSQLITE_OMIT_DEPRECATED \
73 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74 /Dlocaltime=fossil_localtime \
75 /DSQLITE_ENABLE_LOCKING_STYLE=0
76
77 SHELL_OPTIONS = /Dmain=sqlite3_shell \
78 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
79 /Dsqlite3_strglob=strglob \
80 /Dgetenv=fossil_getenv \
81
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -39,11 +39,11 @@
39 !ifdef FOSSIL_ENABLE_SSL
40 INCL = $(INCL) -I$(SSLINCDIR)
41 !endif
42
43 CFLAGS = -nologo -MT -O2
44 LDFLAGS = /NODEFAULTLIB:msvcrt
45
46 !ifdef DEBUG
47 CFLAGS = $(CFLAGS) -Zi
48 LDFLAGS = $(LDFLAGS) /DEBUG
49 !endif
@@ -64,17 +64,16 @@
64 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65 LIBS = $(LIBS) $(SSLLIB)
66 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
67 !endif
68
69 SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
70 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
71 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
72 /DSQLITE_THREADSAFE=0 \
73 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
74 /DSQLITE_OMIT_DEPRECATED
 
 
 
75
76 SHELL_OPTIONS = /Dmain=sqlite3_shell \
77 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
78 /Dsqlite3_strglob=strglob \
79 /Dgetenv=fossil_getenv \
80
M www/makefile.wiki
+1 -1
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,11 @@
208208
 * -Dlocaltime=fossil_localtime
209209
 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210210
 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211211
 * -DSQLITE_THREADSAFE=0
212212
 * -DSQLITE_DEFAULT_FILE_FORMAT=4
213
- * -DSQLITE_ENABLE_STAT3
213
+ * -DSQLITE_OMIT_DEPRECATED
214214
215215
 The first and second symbol definitions above are required; the others
216216
 are merely recommended. The "localtime()" library function in SQLite must
217217
 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218218
 routine will invoke either gmtime() or localtime() depending on the
219219
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,11 @@
208 * -Dlocaltime=fossil_localtime
209 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211 * -DSQLITE_THREADSAFE=0
212 * -DSQLITE_DEFAULT_FILE_FORMAT=4
213 * -DSQLITE_ENABLE_STAT3
214
215 The first and second symbol definitions above are required; the others
216 are merely recommended. The "localtime()" library function in SQLite must
217 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218 routine will invoke either gmtime() or localtime() depending on the
219
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,11 @@
208 * -Dlocaltime=fossil_localtime
209 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211 * -DSQLITE_THREADSAFE=0
212 * -DSQLITE_DEFAULT_FILE_FORMAT=4
213 * -DSQLITE_OMIT_DEPRECATED
214
215 The first and second symbol definitions above are required; the others
216 are merely recommended. The "localtime()" library function in SQLite must
217 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218 routine will invoke either gmtime() or localtime() depending on the
219

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button