Fossil SCM

Further cleanup in the MSVC build. Resync the makefiles with the list of SQLite options.

mistachkin 2013-12-17 22:31 trunk
Commit 61e70f1fc795a4f8d6413f808e01309afbdcacb4
Parent 00d6eea822303dc…
7 files changed +4 -4 +5 -1 +1 -1 +1 -1 +3 -3 +3 -3 +9 -5
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/main.mk
+4 -4
--- src/main.mk
+++ src/main.mk
@@ -376,17 +376,17 @@
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 \
384386
 -DSQLITE_OMIT_DEPRECATED \
385
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
386
- -Dlocaltime=fossil_localtime \
387
- -DSQLITE_ENABLE_LOCKING_STYLE=0
387
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
388388
389389
 # Setup the options used to compile the included SQLite shell.
390390
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
391391
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
392392
 -Dsqlite3_strglob=strglob
393393
--- src/main.mk
+++ src/main.mk
@@ -376,17 +376,17 @@
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,17 @@
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
 
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
M src/makemake.tcl
+5 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1007,10 +1007,11 @@
10071007
 SRCDIR = $B\src
10081008
 OBJDIR = .
10091009
 OX = .
10101010
 O = .obj
10111011
 E = .exe
1012
+P = .pdb
10121013
10131014
 # Uncomment to enable debug symbols
10141015
 # DEBUG = 1
10151016
10161017
 # Uncomment to enable JSON API
@@ -1092,10 +1093,11 @@
10921093
 }
10931094
 writeln " \\"
10941095
 writeln -nonewline " \$(OX)\\fossil.res\n"
10951096
 writeln {
10961097
 APPNAME = $(OX)\fossil$(E)
1098
+PDBNAME = $(OX)\fossil$(P)
10971099
10981100
 all: $(OX) $(APPNAME)
10991101
11001102
 zlib:
11011103
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1156,18 @@
11541156
 -del $(OX)\*.obj
11551157
 -del *.obj
11561158
 -del *_.c
11571159
 -del *.h
11581160
 -del *.map
1161
+ -del *.res
11591162
 -del headers
11601163
 -del linkopts
1161
- -del *.res
1164
+ -del vc*.pdb
11621165
11631166
 realclean: clean
11641167
 -del $(APPNAME)
1168
+ -del $(PDBNAME)
11651169
 -del translate$E
11661170
 -del mkindex$E
11671171
 -del makeheaders$E
11681172
 -del mkversion$E
11691173
11701174
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1007,10 +1007,11 @@
1007 SRCDIR = $B\src
1008 OBJDIR = .
1009 OX = .
1010 O = .obj
1011 E = .exe
 
1012
1013 # Uncomment to enable debug symbols
1014 # DEBUG = 1
1015
1016 # Uncomment to enable JSON API
@@ -1092,10 +1093,11 @@
1092 }
1093 writeln " \\"
1094 writeln -nonewline " \$(OX)\\fossil.res\n"
1095 writeln {
1096 APPNAME = $(OX)\fossil$(E)
 
1097
1098 all: $(OX) $(APPNAME)
1099
1100 zlib:
1101 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1156,18 @@
1154 -del $(OX)\*.obj
1155 -del *.obj
1156 -del *_.c
1157 -del *.h
1158 -del *.map
 
1159 -del headers
1160 -del linkopts
1161 -del *.res
1162
1163 realclean: clean
1164 -del $(APPNAME)
 
1165 -del translate$E
1166 -del mkindex$E
1167 -del makeheaders$E
1168 -del mkversion$E
1169
1170
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1007,10 +1007,11 @@
1007 SRCDIR = $B\src
1008 OBJDIR = .
1009 OX = .
1010 O = .obj
1011 E = .exe
1012 P = .pdb
1013
1014 # Uncomment to enable debug symbols
1015 # DEBUG = 1
1016
1017 # Uncomment to enable JSON API
@@ -1092,10 +1093,11 @@
1093 }
1094 writeln " \\"
1095 writeln -nonewline " \$(OX)\\fossil.res\n"
1096 writeln {
1097 APPNAME = $(OX)\fossil$(E)
1098 PDBNAME = $(OX)\fossil$(P)
1099
1100 all: $(OX) $(APPNAME)
1101
1102 zlib:
1103 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1156,18 @@
1156 -del $(OX)\*.obj
1157 -del *.obj
1158 -del *_.c
1159 -del *.h
1160 -del *.map
1161 -del *.res
1162 -del headers
1163 -del linkopts
1164 -del vc*.pdb
1165
1166 realclean: clean
1167 -del $(APPNAME)
1168 -del $(PDBNAME)
1169 -del translate$E
1170 -del mkindex$E
1171 -del makeheaders$E
1172 -del mkversion$E
1173
1174
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
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 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1698,17 +1698,17 @@
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 \
17071709
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708
- -Dlocaltime=fossil_localtime \
1709
- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17101710
 -D_HAVE_SQLITE_CONFIG_H \
17111711
 -DSQLITE_USE_MALLOC_H \
17121712
 -DSQLITE_USE_MSIZE
17131713
17141714
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17151715
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1698,17 +1698,17 @@
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,17 @@
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
 
 
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
M win/Makefile.mingw.mistachkin
+3 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1698,17 +1698,17 @@
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 \
17071709
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708
- -Dlocaltime=fossil_localtime \
1709
- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17101710
 -D_HAVE_SQLITE_CONFIG_H \
17111711
 -DSQLITE_USE_MALLOC_H \
17121712
 -DSQLITE_USE_MSIZE
17131713
17141714
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17151715
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1698,17 +1698,17 @@
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,17 @@
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 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
 
 
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
M win/Makefile.msc
+9 -5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
1111
 SRCDIR = $B\src
1212
 OBJDIR = .
1313
 OX = .
1414
 O = .obj
1515
 E = .exe
16
+P = .pdb
1617
1718
 # Uncomment to enable debug symbols
1819
 # DEBUG = 1
1920
2021
 # Uncomment to enable JSON API
@@ -64,17 +65,17 @@
6465
 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
6566
 LIBS = $(LIBS) $(SSLLIB)
6667
 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
6768
 !endif
6869
69
-SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
70
+SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
71
+ /DSQLITE_OMIT_LOAD_EXTENSION=1 \
72
+ /DSQLITE_ENABLE_LOCKING_STYLE=0 \
7073
 /DSQLITE_THREADSAFE=0 \
7174
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
7275
 /DSQLITE_OMIT_DEPRECATED \
73
- /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74
- /Dlocaltime=fossil_localtime \
75
- /DSQLITE_ENABLE_LOCKING_STYLE=0
76
+ /DSQLITE_ENABLE_EXPLAIN_COMMENTS
7677
7778
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
7879
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
7980
 /Dsqlite3_strglob=strglob \
8081
 /Dgetenv=fossil_getenv \
@@ -303,10 +304,11 @@
303304
 $(OX)\xfersetup$O \
304305
 $(OX)\zip$O \
305306
 $(OX)\fossil.res
306307
307308
 APPNAME = $(OX)\fossil$(E)
309
+PDBNAME = $(OX)\fossil$(P)
308310
309311
 all: $(OX) $(APPNAME)
310312
311313
 zlib:
312314
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -474,16 +476,18 @@
474476
 -del $(OX)\*.obj
475477
 -del *.obj
476478
 -del *_.c
477479
 -del *.h
478480
 -del *.map
481
+ -del *.res
479482
 -del headers
480483
 -del linkopts
481
- -del *.res
484
+ -del vc*.pdb
482485
483486
 realclean: clean
484487
 -del $(APPNAME)
488
+ -del $(PDBNAME)
485489
 -del translate$E
486490
 -del mkindex$E
487491
 -del makeheaders$E
488492
 -del mkversion$E
489493
490494
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
 
16
17 # Uncomment to enable debug symbols
18 # DEBUG = 1
19
20 # Uncomment to enable JSON API
@@ -64,17 +65,17 @@
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 \
@@ -303,10 +304,11 @@
303 $(OX)\xfersetup$O \
304 $(OX)\zip$O \
305 $(OX)\fossil.res
306
307 APPNAME = $(OX)\fossil$(E)
 
308
309 all: $(OX) $(APPNAME)
310
311 zlib:
312 @echo Building zlib from "$(ZLIBDIR)"...
@@ -474,16 +476,18 @@
474 -del $(OX)\*.obj
475 -del *.obj
476 -del *_.c
477 -del *.h
478 -del *.map
 
479 -del headers
480 -del linkopts
481 -del *.res
482
483 realclean: clean
484 -del $(APPNAME)
 
485 -del translate$E
486 -del mkindex$E
487 -del makeheaders$E
488 -del mkversion$E
489
490
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
17
18 # Uncomment to enable debug symbols
19 # DEBUG = 1
20
21 # Uncomment to enable JSON API
@@ -64,17 +65,17 @@
65 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
66 LIBS = $(LIBS) $(SSLLIB)
67 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
68 !endif
69
70 SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
71 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
72 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
73 /DSQLITE_THREADSAFE=0 \
74 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
75 /DSQLITE_OMIT_DEPRECATED \
76 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
 
77
78 SHELL_OPTIONS = /Dmain=sqlite3_shell \
79 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
80 /Dsqlite3_strglob=strglob \
81 /Dgetenv=fossil_getenv \
@@ -303,10 +304,11 @@
304 $(OX)\xfersetup$O \
305 $(OX)\zip$O \
306 $(OX)\fossil.res
307
308 APPNAME = $(OX)\fossil$(E)
309 PDBNAME = $(OX)\fossil$(P)
310
311 all: $(OX) $(APPNAME)
312
313 zlib:
314 @echo Building zlib from "$(ZLIBDIR)"...
@@ -474,16 +476,18 @@
476 -del $(OX)\*.obj
477 -del *.obj
478 -del *_.c
479 -del *.h
480 -del *.map
481 -del *.res
482 -del headers
483 -del linkopts
484 -del vc*.pdb
485
486 realclean: clean
487 -del $(APPNAME)
488 -del $(PDBNAME)
489 -del translate$E
490 -del mkindex$E
491 -del makeheaders$E
492 -del mkversion$E
493
494

Keyboard Shortcuts

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