Fossil SCM

Add makefile for Cygwin and move its options there. Refactor makemake tool to modularize use of the common options.

mistachkin 2013-12-12 22:41 trunk

Commit e474f5f817e401a1e63ba5d96d18952d2362687f

Parent a76039815d75ec2…

8 files changed +52 +2 -2 +54 -32 +2 -2 +4 -2 +2 -2 +2 -2 +8 -2

+ Makefile.Cygwin.in ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

A Makefile.Cygwin.in

+52

		--- a/Makefile.Cygwin.in
		+++ b/Makefile.Cygwin.in
		@@ -0,0 +1,52 @@
	1	+#!/usr/bin/make
	2	+#
	3	+# This is the top-level makefile for Fossil when the build is occurring
	4	+# on the Cygwin platform.
	5	+#
	6	+#### The toplevel directory of the source tree. Fossil can be built
	7	+# in a directory that is separate from the source tree. Just change
	8	+# the following to point from the build directory to the src/ folder.
	9	+#
	10	+SRCDIR = @srcdir@/src
	11	+
	12	+#### The directory into which object code files should be written.
	13	+# Having a "./" prefix in the value of this variable breaks our use of the
	14	+# "makeheaders" tool when running make on the MinGW platform, apparently
	15	+# due to some command line argument manipulation performed automatically
	16	+# by the shell.
	17	+#
	18	+#
	19	+OBJDIR = bld
	20	+
	21	+#### C Compiler and options for use in building executables that
	22	+# will run on the platform that is doing the build. This is used
	23	+# to compile code-generator programs as part of the build process.
	24	+# See TCC below for the C compiler for building the finished binary.
	25	+#
	26	+BCC = @CC_FOR_BUILD@
	27	+
	28	+#### The suffix to add to final executable file. When cross-compiling
	29	+# to windows, make this ".exe". Otherwise leave it blank.
	30	+#
	31	+E = @EXEEXT@
	32	+
	33	+TCC = @CC@
	34	+
	35	+#### Tcl shell for use in running the fossil testsuite. If you do not
	36	+# care about testing the end result, this can be blank.
	37	+#
	38	+TCLSH = tclsh
	39	+
	40	+LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
	41	+TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @
	42	+INSTALLDIR =$(DESTDIR)@prefix@/bin
	43	+USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
	44	+FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
	45	+FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
	46	+FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
	47	+SQLITE3_CFLAG -DSQLITE_WINNT_MAX_PATH_CHARS=4096BYTES=4096
	48	+SQLITE_CFLAGS +=TE_MAX_MMAP_SIZE=0x7fff0000
	49	+
	50	+include $(SRCDIR)/main.mk
	51	+
	52	+dis

	--- a/Makefile.Cygwin.in
	+++ b/Makefile.Cygwin.in
	@@ -0,0 +1,52 @@

	--- a/Makefile.Cygwin.in
	+++ b/Makefile.Cygwin.in
	@@ -0,0 +1,52 @@
1	#!/usr/bin/make
2	#
3	# This is the top-level makefile for Fossil when the build is occurring
4	# on the Cygwin platform.
5	#
6	#### The toplevel directory of the source tree. Fossil can be built
7	# in a directory that is separate from the source tree. Just change
8	# the following to point from the build directory to the src/ folder.
9	#
10	SRCDIR = @srcdir@/src
11
12	#### The directory into which object code files should be written.
13	# Having a "./" prefix in the value of this variable breaks our use of the
14	# "makeheaders" tool when running make on the MinGW platform, apparently
15	# due to some command line argument manipulation performed automatically
16	# by the shell.
17	#
18	#
19	OBJDIR = bld
20
21	#### C Compiler and options for use in building executables that
22	# will run on the platform that is doing the build. This is used
23	# to compile code-generator programs as part of the build process.
24	# See TCC below for the C compiler for building the finished binary.
25	#
26	BCC = @CC_FOR_BUILD@
27
28	#### The suffix to add to final executable file. When cross-compiling
29	# to windows, make this ".exe". Otherwise leave it blank.
30	#
31	E = @EXEEXT@
32
33	TCC = @CC@
34
35	#### Tcl shell for use in running the fossil testsuite. If you do not
36	# care about testing the end result, this can be blank.
37	#
38	TCLSH = tclsh
39
40	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
41	TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @
42	INSTALLDIR =$(DESTDIR)@prefix@/bin
43	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
44	FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
45	FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
46	FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
47	SQLITE3_CFLAG -DSQLITE_WINNT_MAX_PATH_CHARS=4096BYTES=4096
48	SQLITE_CFLAGS +=TE_MAX_MMAP_SIZE=0x7fff0000
49
50	include $(SRCDIR)/main.mk
51
52	dis

M src/main.mk

+2 -2

		--- src/main.mk
		+++ src/main.mk
		@@ -1160,14 +1160,14 @@
1160	1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162	1162
1163	1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165		- $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1165	+ $(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166	1166
1167	1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1168	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169	1169
1170	1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171	1171	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1172	1172
1173	1173	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1174	1174

	--- src/main.mk
	+++ src/main.mk
	@@ -1160,14 +1160,14 @@
1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165	$(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1172
1173	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1174

	--- src/main.mk
	+++ src/main.mk
	@@ -1160,14 +1160,14 @@
1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165	$(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1172
1173	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1174

M src/makemake.tcl

+54 -32

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -125,10 +125,36 @@
125	125	xfersetup
126	126	zip
127	127	http_ssl
128	128	}
129	129
	130	+# Options used to compile the included SQLite library.
	131	+#
	132	+set SQLITE_OPTIONS {
	133	+ -DSQLITE_OMIT_LOAD_EXTENSION=1
	134	+ -DSQLITE_THREADSAFE=0
	135	+ -DSQLITE_DEFAULT_FILE_FORMAT=4
	136	+ -DSQLITE_OMIT_DEPRECATED
	137	+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
	138	+ -Dlocaltime=fossil_localtime
	139	+ -DSQLITE_ENABLE_LOCKING_STYLE=0
	140	+}
	141	+#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
	142	+#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
	143	+#lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
	144	+#lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
	145	+
	146	+# Options used to compile the included SQLite shell.
	147	+#
	148	+set SHELL_OPTIONS {
	149	+ -Dmain=sqlite3_shell
	150	+ -DSQLITE_OMIT_LOAD_EXTENSION=1
	151	+ -Dsqlite3_strglob=strglob
	152	+}
	153	+#lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
	154	+#lappend SHELL_OPTIONS -Dfopen=fossil_fopen
	155	+
130	156	# Name of the final application
131	157	#
132	158	set name fossil
133	159
134	160	# The "writeln" command sends output to the target makefile.
		@@ -283,29 +309,15 @@
283	309	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
284	310	writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
285	311	writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
286	312	}
287	313
288		-
289	314	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
290		-set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1}
291		-append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
292		-#append opt " -DSQLITE_ENABLE_FTS3=1"
293		-#append opt " -DSQLITE_ENABLE_STAT4"
294		-append opt " -DSQLITE_OMIT_DEPRECATED"
295		-append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296		-append opt " -Dlocaltime=fossil_localtime"
297		-append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298		-append opt " -DSQLITE_WIN32_NO_ANSI"
299		-set SQLITE_OPTIONS $opt
300		-writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
	315	+writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301	316
302	317	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303		-set opt {-Dmain=sqlite3_shell}
304		-append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305		-append opt " -Dsqlite3_strglob=strglob"
306		-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	318	+writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
307	319
308	320	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
309	321	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
310	322
311	323	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
		@@ -774,28 +786,27 @@
774	786	writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
775	787	}
776	788
777	789
778	790	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
779		-set opt $SQLITE_OPTIONS
	791	+set opt [join $SQLITE_OPTIONS { }]
	792	+append opt " -DSQLITE_WIN32_NO_ANSI"
780	793	append opt " -D_HAVE_SQLITE_CONFIG_H"
781	794	append opt " -DSQLITE_USE_MALLOC_H"
782	795	append opt " -DSQLITE_USE_MSIZE"
783		-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
	796	+writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
784	797
785	798	set opt {}
786	799	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
787	800	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
788	801	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
789	802
790	803	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
791		-set opt {-Dmain=sqlite3_shell}
792		-append opt " -Dsqlite3_strglob=strglob"
	804	+set opt [join $SHELL_OPTIONS { }]
793	805	append opt " -Dgetenv=fossil_getenv"
794	806	append opt " -Dfopen=fossil_fopen"
795		-append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
796		-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	807	+writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
797	808
798	809	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
799	810	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
800	811
801	812	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
		@@ -844,11 +855,12 @@
844	855	CFLAGS = -o
845	856	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
846	857	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
847	858	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
848	859	}
849		-writeln "SQLITE_OPTIONS = $SQLITE_OPTIONS\n"
	860	+writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
	861	+writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
850	862	writeln -nonewline "SRC = "
851	863	foreach s [lsort $src] {
852	864	writeln -nonewline "${s}_.c "
853	865	}
854	866	writeln "\n"
		@@ -897,14 +909,14 @@
897	909
898	910	version$E: $B\src\mkversion.c
899	911	$(BCC) -o$@ $**
900	912
901	913	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
902		- $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
	914	+ $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
903	915
904	916	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
905		- $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
	917	+ $(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
906	918
907	919	$(OBJDIR)\th$O : $(SRCDIR)\th.c
908	920	$(TCC) -o$@ -c $**
909	921
910	922	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
		@@ -1036,13 +1048,21 @@
1036	1048	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1037	1049	LIBS = $(LIBS) $(SSLLIB)
1038	1050	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1039	1051	!endif
1040	1052	}
1041		-regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
	1053	+regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
	1054	+lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
1042	1055	set j " \\\n "
1043	1056	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
	1057	+
	1058	+regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
	1059	+lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
	1060	+lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
	1061	+set j " \\\n "
	1062	+writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
	1063	+
1044	1064	writeln -nonewline "SRC = "
1045	1065	set i 0
1046	1066	foreach s [lsort $src] {
1047	1067	if {$i > 0} {
1048	1068	writeln " \\"
		@@ -1100,14 +1120,14 @@
1100	1120
1101	1121	mkversion$E: $B\src\mkversion.c
1102	1122	$(BCC) $**
1103	1123
1104	1124	$(OX)\shell$O : $(SRCDIR)\shell.c
1105		- $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
	1125	+ $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
1106	1126
1107	1127	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1108		- $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
	1128	+ $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
1109	1129
1110	1130	$(OX)\th$O : $(SRCDIR)\th.c
1111	1131	$(TCC) /Fo$@ -c $**
1112	1132
1113	1133	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
		@@ -1193,11 +1213,13 @@
1193	1213	#
1194	1214	puts "building ../win/Makefile.PellesCGMake"
1195	1215	set output_file [open ../win/Makefile.PellesCGMake w]
1196	1216	fconfigure $output_file -translation binary
1197	1217
1198		-writeln {#
	1218	+writeln [string map [list \
	1219	+ <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
	1220	+ <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1199	1221	##############################################################################
1200	1222	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1201	1223	##############################################################################
1202	1224	#
1203	1225	# This file is automatically generated. Instead of editing this
		@@ -1280,17 +1302,17 @@
1280	1302
1281	1303	# define the sqlite files, which need special flags on compile
1282	1304	SQLITESRC=sqlite3.c
1283	1305	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1284	1306	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1285		-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
	1307	+SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1286	1308
1287	1309	# define the sqlite shell files, which need special flags on compile
1288	1310	SQLITESHELLSRC=shell.c
1289	1311	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1290	1312	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1291		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
	1313	+SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1292	1314
1293	1315	# define the th scripting files, which need special flags on compile
1294	1316	THSRC=th.c th_lang.c
1295	1317	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1296	1318	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
		@@ -1383,6 +1405,6 @@
1383	1405	del /F $(RESOURCE)
1384	1406
1385	1407	.PHONY: clobber
1386	1408	clobber: clean
1387	1409	del /F *.exe
1388		-}
	1410	+}]
1389	1411

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -125,10 +125,36 @@
125	xfersetup
126	zip
127	http_ssl
128	}
129


























130	# Name of the final application
131	#
132	set name fossil
133
134	# The "writeln" command sends output to the target makefile.
	@@ -283,29 +309,15 @@
283	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
284	writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
285	writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
286	}
287
288
289	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
290	set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1}
291	append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
292	#append opt " -DSQLITE_ENABLE_FTS3=1"
293	#append opt " -DSQLITE_ENABLE_STAT4"
294	append opt " -DSQLITE_OMIT_DEPRECATED"
295	append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296	append opt " -Dlocaltime=fossil_localtime"
297	append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298	append opt " -DSQLITE_WIN32_NO_ANSI"
299	set SQLITE_OPTIONS $opt
300	writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301
302	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303	set opt {-Dmain=sqlite3_shell}
304	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305	append opt " -Dsqlite3_strglob=strglob"
306	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
307
308	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
309	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
310
311	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -774,28 +786,27 @@
774	writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
775	}
776
777
778	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
779	set opt $SQLITE_OPTIONS

780	append opt " -D_HAVE_SQLITE_CONFIG_H"
781	append opt " -DSQLITE_USE_MALLOC_H"
782	append opt " -DSQLITE_USE_MSIZE"
783	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
784
785	set opt {}
786	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
788	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
789
790	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
791	set opt {-Dmain=sqlite3_shell}
792	append opt " -Dsqlite3_strglob=strglob"
793	append opt " -Dgetenv=fossil_getenv"
794	append opt " -Dfopen=fossil_fopen"
795	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
796	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
797
798	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
799	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
800
801	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -844,11 +855,12 @@
844	CFLAGS = -o
845	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
846	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
847	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
848	}
849	writeln "SQLITE_OPTIONS = $SQLITE_OPTIONS\n"

850	writeln -nonewline "SRC = "
851	foreach s [lsort $src] {
852	writeln -nonewline "${s}_.c "
853	}
854	writeln "\n"
	@@ -897,14 +909,14 @@
897
898	version$E: $B\src\mkversion.c
899	$(BCC) -o$@ $**
900
901	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
902	$(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
903
904	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
905	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
906
907	$(OBJDIR)\th$O : $(SRCDIR)\th.c
908	$(TCC) -o$@ -c $**
909
910	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	@@ -1036,13 +1048,21 @@
1036	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1037	LIBS = $(LIBS) $(SSLLIB)
1038	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1039	!endif
1040	}
1041	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS

1042	set j " \\\n "
1043	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"







1044	writeln -nonewline "SRC = "
1045	set i 0
1046	foreach s [lsort $src] {
1047	if {$i > 0} {
1048	writeln " \\"
	@@ -1100,14 +1120,14 @@
1100
1101	mkversion$E: $B\src\mkversion.c
1102	$(BCC) $**
1103
1104	$(OX)\shell$O : $(SRCDIR)\shell.c
1105	$(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1106
1107	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1108	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1109
1110	$(OX)\th$O : $(SRCDIR)\th.c
1111	$(TCC) /Fo$@ -c $**
1112
1113	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
	@@ -1193,11 +1213,13 @@
1193	#
1194	puts "building ../win/Makefile.PellesCGMake"
1195	set output_file [open ../win/Makefile.PellesCGMake w]
1196	fconfigure $output_file -translation binary
1197
1198	writeln {#


1199	##############################################################################
1200	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1201	##############################################################################
1202	#
1203	# This file is automatically generated. Instead of editing this
	@@ -1280,17 +1302,17 @@
1280
1281	# define the sqlite files, which need special flags on compile
1282	SQLITESRC=sqlite3.c
1283	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1284	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1285	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1286
1287	# define the sqlite shell files, which need special flags on compile
1288	SQLITESHELLSRC=shell.c
1289	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1290	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1291	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
1292
1293	# define the th scripting files, which need special flags on compile
1294	THSRC=th.c th_lang.c
1295	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1296	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
	@@ -1383,6 +1405,6 @@
1383	del /F $(RESOURCE)
1384
1385	.PHONY: clobber
1386	clobber: clean
1387	del /F *.exe
1388	}
1389

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -125,10 +125,36 @@
125	xfersetup
126	zip
127	http_ssl
128	}
129
130	# Options used to compile the included SQLite library.
131	#
132	set SQLITE_OPTIONS {
133	-DSQLITE_OMIT_LOAD_EXTENSION=1
134	-DSQLITE_THREADSAFE=0
135	-DSQLITE_DEFAULT_FILE_FORMAT=4
136	-DSQLITE_OMIT_DEPRECATED
137	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
138	-Dlocaltime=fossil_localtime
139	-DSQLITE_ENABLE_LOCKING_STYLE=0
140	}
141	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
142	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
143	#lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
144	#lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
145
146	# Options used to compile the included SQLite shell.
147	#
148	set SHELL_OPTIONS {
149	-Dmain=sqlite3_shell
150	-DSQLITE_OMIT_LOAD_EXTENSION=1
151	-Dsqlite3_strglob=strglob
152	}
153	#lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
154	#lappend SHELL_OPTIONS -Dfopen=fossil_fopen
155
156	# Name of the final application
157	#
158	set name fossil
159
160	# The "writeln" command sends output to the target makefile.
	@@ -283,29 +309,15 @@
309	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
310	writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
311	writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
312	}
313

314	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
315	writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"










316
317	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
318	writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"



319
320	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
321	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
322
323	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -774,28 +786,27 @@
786	writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
787	}
788
789
790	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
791	set opt [join $SQLITE_OPTIONS { }]
792	append opt " -DSQLITE_WIN32_NO_ANSI"
793	append opt " -D_HAVE_SQLITE_CONFIG_H"
794	append opt " -DSQLITE_USE_MALLOC_H"
795	append opt " -DSQLITE_USE_MSIZE"
796	writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
797
798	set opt {}
799	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
800	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
801	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
802
803	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
804	set opt [join $SHELL_OPTIONS { }]

805	append opt " -Dgetenv=fossil_getenv"
806	append opt " -Dfopen=fossil_fopen"
807	writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"

808
809	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
810	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
811
812	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -844,11 +855,12 @@
855	CFLAGS = -o
856	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
857	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
858	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
859	}
860	writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
861	writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
862	writeln -nonewline "SRC = "
863	foreach s [lsort $src] {
864	writeln -nonewline "${s}_.c "
865	}
866	writeln "\n"
	@@ -897,14 +909,14 @@
909
910	version$E: $B\src\mkversion.c
911	$(BCC) -o$@ $**
912
913	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
914	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
915
916	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
917	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
918
919	$(OBJDIR)\th$O : $(SRCDIR)\th.c
920	$(TCC) -o$@ -c $**
921
922	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	@@ -1036,13 +1048,21 @@
1048	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1049	LIBS = $(LIBS) $(SSLLIB)
1050	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1051	!endif
1052	}
1053	regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1054	lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
1055	set j " \\\n "
1056	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1057
1058	regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1059	lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
1060	lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
1061	set j " \\\n "
1062	writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1063
1064	writeln -nonewline "SRC = "
1065	set i 0
1066	foreach s [lsort $src] {
1067	if {$i > 0} {
1068	writeln " \\"
	@@ -1100,14 +1120,14 @@
1120
1121	mkversion$E: $B\src\mkversion.c
1122	$(BCC) $**
1123
1124	$(OX)\shell$O : $(SRCDIR)\shell.c
1125	$(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
1126
1127	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1128	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
1129
1130	$(OX)\th$O : $(SRCDIR)\th.c
1131	$(TCC) /Fo$@ -c $**
1132
1133	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
	@@ -1193,11 +1213,13 @@
1213	#
1214	puts "building ../win/Makefile.PellesCGMake"
1215	set output_file [open ../win/Makefile.PellesCGMake w]
1216	fconfigure $output_file -translation binary
1217
1218	writeln [string map [list \
1219	<<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1220	<<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1221	##############################################################################
1222	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1223	##############################################################################
1224	#
1225	# This file is automatically generated. Instead of editing this
	@@ -1280,17 +1302,17 @@
1302
1303	# define the sqlite files, which need special flags on compile
1304	SQLITESRC=sqlite3.c
1305	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1306	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1307	SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1308
1309	# define the sqlite shell files, which need special flags on compile
1310	SQLITESHELLSRC=shell.c
1311	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1312	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1313	SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1314
1315	# define the th scripting files, which need special flags on compile
1316	THSRC=th.c th_lang.c
1317	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1318	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
	@@ -1383,6 +1405,6 @@
1405	del /F $(RESOURCE)
1406
1407	.PHONY: clobber
1408	clobber: clean
1409	del /F *.exe
1410	}]
1411

M win/Makefile.PellesCGMake

+2 -2

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -83,17 +83,17 @@
83	83
84	84	# define the sqlite files, which need special flags on compile
85	85	SQLITESRC=sqlite3.c
86	86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	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=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
	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 -DSQLITE_WIN32_NO_ANSI
89	89
90	90	# define the sqlite shell files, which need special flags on compile
91	91	SQLITESHELLSRC=shell.c
92	92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
	94	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95	95
96	96	# define the th scripting files, which need special flags on compile
97	97	THSRC=th.c th_lang.c
98	98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100	100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,17 +83,17 @@
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=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
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	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,17 +83,17 @@
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 -DSQLITE_WIN32_NO_ANSI
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	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

M win/Makefile.dmc

+4 -2

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -25,10 +25,12 @@
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29	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 -DSQLITE_WIN32_NO_ANSI
	30	+
	31	+SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
30	32
31	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 winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32	34
33	35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34	36
		@@ -66,14 +68,14 @@
66	68
67	69	version$E: $B\src\mkversion.c
68	70	$(BCC) -o$@ $**
69	71
70	72	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71		- $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
	73	+ $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
72	74
73	75	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74		- $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
	76	+ $(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
75	77
76	78	$(OBJDIR)\th$O : $(SRCDIR)\th.c
77	79	$(TCC) -o$@ -c $**
78	80
79	81	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
80	82

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -25,10 +25,12 @@
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 -DSQLITE_WIN32_NO_ANSI


30
31	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 winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32
33	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
	@@ -66,14 +68,14 @@
66
67	version$E: $B\src\mkversion.c
68	$(BCC) -o$@ $**
69
70	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71	$(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
72
73	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75
76	$(OBJDIR)\th$O : $(SRCDIR)\th.c
77	$(TCC) -o$@ -c $**
78
79	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
80

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -25,10 +25,12 @@
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 -DSQLITE_WIN32_NO_ANSI
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 winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
	@@ -66,14 +68,14 @@
68
69	version$E: $B\src\mkversion.c
70	$(BCC) -o$@ $**
71
72	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
73	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
74
75	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
76	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
77
78	$(OBJDIR)\th$O : $(SRCDIR)\th.c
79	$(TCC) -o$@ -c $**
80
81	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
82

M win/Makefile.mingw

+2 -2

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1687,19 +1687,19 @@
1687	1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688	1688
1689	1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690	1690
1691	1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692		- $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1692	+ $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693	1693
1694	1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696	1696
1697	1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698	1698
1699	1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700		- $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1700	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701	1701
1702	1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704	1704
1705	1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706	1706

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1687,19 +1687,19 @@
1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692	$(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700	$(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1687,19 +1687,19 @@
1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692	$(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706

M win/Makefile.mingw.mistachkin

+2 -2

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1687,19 +1687,19 @@
1687	1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688	1688
1689	1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690	1690
1691	1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692		- $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1692	+ $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693	1693
1694	1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696	1696
1697	1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698	1698
1699	1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700		- $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1700	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701	1701
1702	1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704	1704
1705	1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706	1706

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1687,19 +1687,19 @@
1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692	$(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700	$(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1687,19 +1687,19 @@
1687	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692	$(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1703	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706

M win/Makefile.msc

+8 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -73,10 +73,16 @@
73	73	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74	74	/Dlocaltime=fossil_localtime \
75	75	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
76	76	/DSQLITE_WIN32_NO_ANSI
77	77
	78	+SHELL_OPTIONS = /Dmain=sqlite3_shell \
	79	+ /DSQLITE_OMIT_LOAD_EXTENSION=1 \
	80	+ /Dsqlite3_strglob=strglob \
	81	+ /Dgetenv=fossil_getenv \
	82	+ /Dfopen=fossil_fopen
	83	+
78	84	SRC = add_.c \
79	85	allrepo_.c \
80	86	attach_.c \
81	87	bag_.c \
82	88	bisect_.c \
		@@ -441,14 +447,14 @@
441	447
442	448	mkversion$E: $B\src\mkversion.c
443	449	$(BCC) $**
444	450
445	451	$(OX)\shell$O : $(SRCDIR)\shell.c
446		- $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
	452	+ $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
447	453
448	454	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
449		- $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
	455	+ $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
450	456
451	457	$(OX)\th$O : $(SRCDIR)\th.c
452	458	$(TCC) /Fo$@ -c $**
453	459
454	460	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
455	461

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -73,10 +73,16 @@
73	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74	/Dlocaltime=fossil_localtime \
75	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
76	/DSQLITE_WIN32_NO_ANSI
77






78	SRC = add_.c \
79	allrepo_.c \
80	attach_.c \
81	bag_.c \
82	bisect_.c \
	@@ -441,14 +447,14 @@
441
442	mkversion$E: $B\src\mkversion.c
443	$(BCC) $**
444
445	$(OX)\shell$O : $(SRCDIR)\shell.c
446	$(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
447
448	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
449	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
450
451	$(OX)\th$O : $(SRCDIR)\th.c
452	$(TCC) /Fo$@ -c $**
453
454	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
455

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -73,10 +73,16 @@
73	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74	/Dlocaltime=fossil_localtime \
75	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
76	/DSQLITE_WIN32_NO_ANSI
77
78	SHELL_OPTIONS = /Dmain=sqlite3_shell \
79	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
80	/Dsqlite3_strglob=strglob \
81	/Dgetenv=fossil_getenv \
82	/Dfopen=fossil_fopen
83
84	SRC = add_.c \
85	allrepo_.c \
86	attach_.c \
87	bag_.c \
88	bisect_.c \
	@@ -441,14 +447,14 @@
447
448	mkversion$E: $B\src\mkversion.c
449	$(BCC) $**
450
451	$(OX)\shell$O : $(SRCDIR)\shell.c
452	$(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
453
454	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
455	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) $**
456
457	$(OX)\th$O : $(SRCDIR)\th.c
458	$(TCC) /Fo$@ -c $**
459
460	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
461

Fossil SCM

Keyboard Shortcuts