Fossil SCM

Removed -DCSON_FOSSIL_MODE from cc flags. Integrated JSON-under-MSC-related patches from the list.

stephan 2013-01-24 15:19 trunk

Commit bb63588e1bd65f1556bcf778a49833eda55c4e14

Parent 7b17a4ddb3ffb43…

4 files changed +1 -1 +30 -11 +1 -1 +30 -7

~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.msc

M src/main.mk

+1 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -1146,11 +1146,11 @@
1146	1146	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147	1147	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148	1148
1149	1149
1150	1150	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151		- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
	1151	+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1152	1152
1153	1153	#
1154	1154	# The list of all the targets that do not correspond to real files. This stops
1155	1155	# 'make' from getting confused when someone makes an error in a rule.
1156	1156	#
1157	1157

	--- src/main.mk
	+++ src/main.mk
	@@ -1146,11 +1146,11 @@
1146	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1152
1153	#
1154	# The list of all the targets that do not correspond to real files. This stops
1155	# 'make' from getting confused when someone makes an error in a rule.
1156	#
1157

	--- src/main.mk
	+++ src/main.mk
	@@ -1146,11 +1146,11 @@
1146	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1152
1153	#
1154	# The list of all the targets that do not correspond to real files. This stops
1155	# 'make' from getting confused when someone makes an error in a rule.
1156	#
1157

M src/makemake.tcl

+30 -11

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -308,11 +308,11 @@
308	308	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309	309
310	310	set opt {}
311	311	writeln {
312	312	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313		- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
	313	+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314	314
315	315	#
316	316	# The list of all the targets that do not correspond to real files. This stops
317	317	# 'make' from getting confused when someone makes an error in a rule.
318	318	#
		@@ -751,11 +751,11 @@
751	751	set opt $SQLITE_OPTIONS
752	752	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753	753
754	754	set opt {}
755	755	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756		-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
	756	+writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757	757	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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758	758
759	759	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760	760	set opt {-Dmain=sqlite3_shell}
761	761	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
		@@ -959,18 +959,35 @@
959	959
960	960	# zlib options
961	961	ZINCDIR = $(B)\compat\zlib
962	962	ZLIBDIR = $(B)\compat\zlib
963	963	ZLIB = zlib.lib
	964	+
	965	+# Uncomment to enable JSON API
	966	+# FOSSIL_ENABLE_JSON = 1
	967	+
	968	+# Uncomment to enable markdown support
	969	+# FOSSIL_ENABLE_MARKDOWN = 1
964	970
965	971	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966	972
967	973	CFLAGS = -nologo -MT -O2
968	974	BCC = $(CC) $(CFLAGS)
969	975	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
	976	+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
970	977	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971	978	LIBDIR = -LIBPATH:$(ZLIBDIR)
	979	+
	980	+!ifdef FOSSIL_ENABLE_JSON
	981	+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
	982	+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
	983	+!endif
	984	+
	985	+!ifdef FOSSIL_ENABLE_MARKDOWN
	986	+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
	987	+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
	988	+!endif
972	989	}
973	990	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974	991	set j " \\\n "
975	992	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976	993	writeln -nonewline "SRC = "
		@@ -981,24 +998,22 @@
981	998	writeln -nonewline " "
982	999	}
983	1000	writeln -nonewline "${s}_.c"; incr i
984	1001	}
985	1002	writeln "\n"
	1003	+set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
986	1004	writeln -nonewline "OBJ = "
987	1005	set i 0
988		-foreach s [lsort $src] {
	1006	+foreach s [lsort [concat $src $AdditionalObj]] {
989	1007	if {$i > 0} {
990	1008	writeln " \\"
991	1009	writeln -nonewline " "
992	1010	}
993	1011	writeln -nonewline "\$(OX)\\$s\$O"; incr i
994	1012	}
995	1013	writeln " \\"
996		-writeln " \$(OX)\\shell\$O \\"
997		-writeln " \$(OX)\\sqlite3\$O \\"
998		-writeln " \$(OX)\\th\$O \\"
999		-writeln " \$(OX)\\th_lang\$O"
	1014	+writeln -nonewline " \$(OX)\\fossil.res\n"
1000	1015	writeln {
1001	1016	APPNAME = $(OX)\fossil$(E)
1002	1017
1003	1018	all: $(OX) $(APPNAME)
1004	1019
		@@ -1006,15 +1021,15 @@
1006	1021	@echo Building zlib from "$(ZLIBDIR)"...
1007	1022	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1008	1023
1009	1024	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1010	1025	cd $(OX)
1011		- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
	1026	+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1012	1027
1013	1028	$(OX)\linkopts: $B\win\Makefile.msc}
1014	1029	set redir {>}
1015		-foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
	1030	+foreach s [lsort [concat $src $AdditionalObj]] {
1016	1031	writeln "\techo \$(OX)\\$s.obj $redir \$@"
1017	1032	set redir {>>}
1018	1033	}
1019	1034	writeln "\techo \$(LIBS) >> \$@\n\n"
1020	1035
		@@ -1047,12 +1062,12 @@
1047	1062	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1048	1063	$(TCC) /Fo$@ -c $**
1049	1064
1050	1065	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1051	1066	$** > $@
1052		-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053		- cp $(SRCDIR)\cson_amalgamation.h $@
	1067	+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
	1068	+ $(TCC) /Fo$@ -c $**
1054	1069
1055	1070	page_index.h: mkindex$E $(SRC)
1056	1071	$** > $@
1057	1072
1058	1073	clean:
		@@ -1062,10 +1077,11 @@
1062	1077	-del *.h
1063	1078	-del *.map
1064	1079	-del *.manifest
1065	1080	-del headers
1066	1081	-del linkopts
	1082	+ -del *.res
1067	1083
1068	1084	realclean: clean
1069	1085	-del $(APPNAME)
1070	1086	-del translate$E
1071	1087	-del mkindex$E
		@@ -1092,10 +1108,13 @@
1092	1108	writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1093	1109	writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1094	1110	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1095	1111	writeln "\ttranslate\$E \$** > \$@\n"
1096	1112	}
	1113	+
	1114	+writeln "fossil.res : ..\\win\\fossil.rc"
	1115	+writeln "\t\$(RCC) -fo \$@ \$**"
1097	1116
1098	1117	writeln "headers: makeheaders\$E page_index.h VERSION.h"
1099	1118	writeln -nonewline "\tmakeheaders\$E "
1100	1119	set i 0
1101	1120	foreach s [lsort $src] {
1102	1121

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -308,11 +308,11 @@
308	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310	set opt {}
311	writeln {
312	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
314
315	#
316	# The list of all the targets that do not correspond to real files. This stops
317	# 'make' from getting confused when someone makes an error in a rule.
318	#
	@@ -751,11 +751,11 @@
751	set opt $SQLITE_OPTIONS
752	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754	set opt {}
755	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
757	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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760	set opt {-Dmain=sqlite3_shell}
761	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
	@@ -959,18 +959,35 @@
959
960	# zlib options
961	ZINCDIR = $(B)\compat\zlib
962	ZLIBDIR = $(B)\compat\zlib
963	ZLIB = zlib.lib






964
965	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966
967	CFLAGS = -nologo -MT -O2
968	BCC = $(CC) $(CFLAGS)
969	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)

970	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971	LIBDIR = -LIBPATH:$(ZLIBDIR)










972	}
973	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974	set j " \\\n "
975	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976	writeln -nonewline "SRC = "
	@@ -981,24 +998,22 @@
981	writeln -nonewline " "
982	}
983	writeln -nonewline "${s}_.c"; incr i
984	}
985	writeln "\n"

986	writeln -nonewline "OBJ = "
987	set i 0
988	foreach s [lsort $src] {
989	if {$i > 0} {
990	writeln " \\"
991	writeln -nonewline " "
992	}
993	writeln -nonewline "\$(OX)\\$s\$O"; incr i
994	}
995	writeln " \\"
996	writeln " \$(OX)\\shell\$O \\"
997	writeln " \$(OX)\\sqlite3\$O \\"
998	writeln " \$(OX)\\th\$O \\"
999	writeln " \$(OX)\\th_lang\$O"
1000	writeln {
1001	APPNAME = $(OX)\fossil$(E)
1002
1003	all: $(OX) $(APPNAME)
1004
	@@ -1006,15 +1021,15 @@
1006	@echo Building zlib from "$(ZLIBDIR)"...
1007	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1008
1009	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1010	cd $(OX)
1011	link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
1012
1013	$(OX)\linkopts: $B\win\Makefile.msc}
1014	set redir {>}
1015	foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
1016	writeln "\techo \$(OX)\\$s.obj $redir \$@"
1017	set redir {>>}
1018	}
1019	writeln "\techo \$(LIBS) >> \$@\n\n"
1020
	@@ -1047,12 +1062,12 @@
1047	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1048	$(TCC) /Fo$@ -c $**
1049
1050	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1051	$** > $@
1052	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053	cp $(SRCDIR)\cson_amalgamation.h $@
1054
1055	page_index.h: mkindex$E $(SRC)
1056	$** > $@
1057
1058	clean:
	@@ -1062,10 +1077,11 @@
1062	-del *.h
1063	-del *.map
1064	-del *.manifest
1065	-del headers
1066	-del linkopts

1067
1068	realclean: clean
1069	-del $(APPNAME)
1070	-del translate$E
1071	-del mkindex$E
	@@ -1092,10 +1108,13 @@
1092	writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1093	writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1094	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1095	writeln "\ttranslate\$E \$** > \$@\n"
1096	}



1097
1098	writeln "headers: makeheaders\$E page_index.h VERSION.h"
1099	writeln -nonewline "\tmakeheaders\$E "
1100	set i 0
1101	foreach s [lsort $src] {
1102

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -308,11 +308,11 @@
308	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310	set opt {}
311	writeln {
312	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314
315	#
316	# The list of all the targets that do not correspond to real files. This stops
317	# 'make' from getting confused when someone makes an error in a rule.
318	#
	@@ -751,11 +751,11 @@
751	set opt $SQLITE_OPTIONS
752	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754	set opt {}
755	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757	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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760	set opt {-Dmain=sqlite3_shell}
761	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
	@@ -959,18 +959,35 @@
959
960	# zlib options
961	ZINCDIR = $(B)\compat\zlib
962	ZLIBDIR = $(B)\compat\zlib
963	ZLIB = zlib.lib
964
965	# Uncomment to enable JSON API
966	# FOSSIL_ENABLE_JSON = 1
967
968	# Uncomment to enable markdown support
969	# FOSSIL_ENABLE_MARKDOWN = 1
970
971	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
972
973	CFLAGS = -nologo -MT -O2
974	BCC = $(CC) $(CFLAGS)
975	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
976	RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
977	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
978	LIBDIR = -LIBPATH:$(ZLIBDIR)
979
980	!ifdef FOSSIL_ENABLE_JSON
981	TCC = $(TCC) -DFOSSIL_ENABLE_JSON
982	RCC = $(RCC) -DFOSSIL_ENABLE_JSON
983	!endif
984
985	!ifdef FOSSIL_ENABLE_MARKDOWN
986	TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
987	RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
988	!endif
989	}
990	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
991	set j " \\\n "
992	writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
993	writeln -nonewline "SRC = "
	@@ -981,24 +998,22 @@
998	writeln -nonewline " "
999	}
1000	writeln -nonewline "${s}_.c"; incr i
1001	}
1002	writeln "\n"
1003	set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
1004	writeln -nonewline "OBJ = "
1005	set i 0
1006	foreach s [lsort [concat $src $AdditionalObj]] {
1007	if {$i > 0} {
1008	writeln " \\"
1009	writeln -nonewline " "
1010	}
1011	writeln -nonewline "\$(OX)\\$s\$O"; incr i
1012	}
1013	writeln " \\"
1014	writeln -nonewline " \$(OX)\\fossil.res\n"



1015	writeln {
1016	APPNAME = $(OX)\fossil$(E)
1017
1018	all: $(OX) $(APPNAME)
1019
	@@ -1006,15 +1021,15 @@
1021	@echo Building zlib from "$(ZLIBDIR)"...
1022	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1023
1024	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1025	cd $(OX)
1026	link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1027
1028	$(OX)\linkopts: $B\win\Makefile.msc}
1029	set redir {>}
1030	foreach s [lsort [concat $src $AdditionalObj]] {
1031	writeln "\techo \$(OX)\\$s.obj $redir \$@"
1032	set redir {>>}
1033	}
1034	writeln "\techo \$(LIBS) >> \$@\n\n"
1035
	@@ -1047,12 +1062,12 @@
1062	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1063	$(TCC) /Fo$@ -c $**
1064
1065	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1066	$** > $@
1067	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1068	$(TCC) /Fo$@ -c $**
1069
1070	page_index.h: mkindex$E $(SRC)
1071	$** > $@
1072
1073	clean:
	@@ -1062,10 +1077,11 @@
1077	-del *.h
1078	-del *.map
1079	-del *.manifest
1080	-del headers
1081	-del linkopts
1082	-del *.res
1083
1084	realclean: clean
1085	-del $(APPNAME)
1086	-del translate$E
1087	-del mkindex$E
	@@ -1092,10 +1108,13 @@
1108	writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1109	writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1110	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1111	writeln "\ttranslate\$E \$** > \$@\n"
1112	}
1113
1114	writeln "fossil.res : ..\\win\\fossil.rc"
1115	writeln "\t\$(RCC) -fo \$@ \$**"
1116
1117	writeln "headers: makeheaders\$E page_index.h VERSION.h"
1118	writeln -nonewline "\tmakeheaders\$E "
1119	set i 0
1120	foreach s [lsort $src] {
1121

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1633,11 +1633,11 @@
1633	1633
1634	1634	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635	1635	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636	1636
1637	1637	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638		- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
	1638	+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639	1639
1640	1640	$(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641	1641
1642	1642	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643	1643	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644	1644

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1633,11 +1633,11 @@
1633
1634	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1639
1640	$(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1633,11 +1633,11 @@
1633
1634	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639
1640	$(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644

M win/Makefile.msc

+30 -7

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -22,18 +22,35 @@
22	22
23	23	# zlib options
24	24	ZINCDIR = $(B)\compat\zlib
25	25	ZLIBDIR = $(B)\compat\zlib
26	26	ZLIB = zlib.lib
	27	+
	28	+# Uncomment to enable JSON API
	29	+# FOSSIL_ENABLE_JSON = 1
	30	+
	31	+# Uncomment to enable markdown support
	32	+# FOSSIL_ENABLE_MARKDOWN = 1
27	33
28	34	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
29	35
30	36	CFLAGS = -nologo -MT -O2
31	37	BCC = $(CC) $(CFLAGS)
32	38	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
	39	+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
33	40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
34	41	LIBDIR = -LIBPATH:$(ZLIBDIR)
	42	+
	43	+!ifdef FOSSIL_ENABLE_JSON
	44	+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
	45	+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
	46	+!endif
	47	+
	48	+!ifdef FOSSIL_ENABLE_MARKDOWN
	49	+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
	50	+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
	51	+!endif
35	52
36	53	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
37	54	/DSQLITE_THREADSAFE=0 \
38	55	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
39	56	/DSQLITE_ENABLE_STAT3 \
		@@ -160,10 +177,11 @@
160	177	$(OX)\clearsign$O \
161	178	$(OX)\clone$O \
162	179	$(OX)\comformat$O \
163	180	$(OX)\configure$O \
164	181	$(OX)\content$O \
	182	+ $(OX)\cson_amalgamation$O \
165	183	$(OX)\db$O \
166	184	$(OX)\delta$O \
167	185	$(OX)\deltacmd$O \
168	186	$(OX)\descendants$O \
169	187	$(OX)\diff$O \
		@@ -219,19 +237,23 @@
219	237	$(OX)\rss$O \
220	238	$(OX)\schema$O \
221	239	$(OX)\search$O \
222	240	$(OX)\setup$O \
223	241	$(OX)\sha1$O \
	242	+ $(OX)\shell$O \
224	243	$(OX)\shun$O \
225	244	$(OX)\skins$O \
226	245	$(OX)\sqlcmd$O \
	246	+ $(OX)\sqlite3$O \
227	247	$(OX)\stash$O \
228	248	$(OX)\stat$O \
229	249	$(OX)\style$O \
230	250	$(OX)\sync$O \
231	251	$(OX)\tag$O \
232	252	$(OX)\tar$O \
	253	+ $(OX)\th$O \
	254	+ $(OX)\th_lang$O \
233	255	$(OX)\th_main$O \
234	256	$(OX)\timeline$O \
235	257	$(OX)\tkt$O \
236	258	$(OX)\tktsetup$O \
237	259	$(OX)\undo$O \
		@@ -247,14 +269,11 @@
247	269	$(OX)\winhttp$O \
248	270	$(OX)\wysiwyg$O \
249	271	$(OX)\xfer$O \
250	272	$(OX)\xfersetup$O \
251	273	$(OX)\zip$O \
252		- $(OX)\shell$O \
253		- $(OX)\sqlite3$O \
254		- $(OX)\th$O \
255		- $(OX)\th_lang$O
	274	+ $(OX)\fossil.res
256	275
257	276	APPNAME = $(OX)\fossil$(E)
258	277
259	278	all: $(OX) $(APPNAME)
260	279
		@@ -262,11 +281,11 @@
262	281	@echo Building zlib from "$(ZLIBDIR)"...
263	282	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264	283
265	284	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266	285	cd $(OX)
267		- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
	286	+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
268	287
269	288	$(OX)\linkopts: $B\win\Makefile.msc
270	289	echo $(OX)\add.obj > $@
271	290	echo $(OX)\allrepo.obj >> $@
272	291	echo $(OX)\attach.obj >> $@
		@@ -282,10 +301,11 @@
282	301	echo $(OX)\clearsign.obj >> $@
283	302	echo $(OX)\clone.obj >> $@
284	303	echo $(OX)\comformat.obj >> $@
285	304	echo $(OX)\configure.obj >> $@
286	305	echo $(OX)\content.obj >> $@
	306	+ echo $(OX)\cson_amalgamation.obj >> $@
287	307	echo $(OX)\db.obj >> $@
288	308	echo $(OX)\delta.obj >> $@
289	309	echo $(OX)\deltacmd.obj >> $@
290	310	echo $(OX)\descendants.obj >> $@
291	311	echo $(OX)\diff.obj >> $@
		@@ -407,12 +427,12 @@
407	427	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408	428	$(TCC) /Fo$@ -c $**
409	429
410	430	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411	431	$** > $@
412		-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413		- cp $(SRCDIR)\cson_amalgamation.h $@
	432	+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
	433	+ $(TCC) /Fo$@ -c $**
414	434
415	435	page_index.h: mkindex$E $(SRC)
416	436	$** > $@
417	437
418	438	clean:
		@@ -422,10 +442,11 @@
422	442	-del *.h
423	443	-del *.map
424	444	-del *.manifest
425	445	-del headers
426	446	-del linkopts
	447	+ -del *.res
427	448
428	449	realclean: clean
429	450	-del $(APPNAME)
430	451	-del translate$E
431	452	-del mkindex$E
		@@ -1070,10 +1091,12 @@
1070	1091	$(TCC) /Fo$@ -c zip_.c
1071	1092
1072	1093	zip_.c : $(SRCDIR)\zip.c
1073	1094	translate$E $** > $@
1074	1095
	1096	+fossil.res : ..\win\fossil.rc
	1097	+ $(RCC) -fo $@ $**
1075	1098	headers: makeheaders$E page_index.h VERSION.h
1076	1099	makeheaders$E add_.c:add.h \
1077	1100	allrepo_.c:allrepo.h \
1078	1101	attach_.c:attach.h \
1079	1102	bag_.c:bag.h \
1080	1103

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -22,18 +22,35 @@
22
23	# zlib options
24	ZINCDIR = $(B)\compat\zlib
25	ZLIBDIR = $(B)\compat\zlib
26	ZLIB = zlib.lib






27
28	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
29
30	CFLAGS = -nologo -MT -O2
31	BCC = $(CC) $(CFLAGS)
32	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)

33	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
34	LIBDIR = -LIBPATH:$(ZLIBDIR)










35
36	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
37	/DSQLITE_THREADSAFE=0 \
38	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
39	/DSQLITE_ENABLE_STAT3 \
	@@ -160,10 +177,11 @@
160	$(OX)\clearsign$O \
161	$(OX)\clone$O \
162	$(OX)\comformat$O \
163	$(OX)\configure$O \
164	$(OX)\content$O \

165	$(OX)\db$O \
166	$(OX)\delta$O \
167	$(OX)\deltacmd$O \
168	$(OX)\descendants$O \
169	$(OX)\diff$O \
	@@ -219,19 +237,23 @@
219	$(OX)\rss$O \
220	$(OX)\schema$O \
221	$(OX)\search$O \
222	$(OX)\setup$O \
223	$(OX)\sha1$O \

224	$(OX)\shun$O \
225	$(OX)\skins$O \
226	$(OX)\sqlcmd$O \

227	$(OX)\stash$O \
228	$(OX)\stat$O \
229	$(OX)\style$O \
230	$(OX)\sync$O \
231	$(OX)\tag$O \
232	$(OX)\tar$O \


233	$(OX)\th_main$O \
234	$(OX)\timeline$O \
235	$(OX)\tkt$O \
236	$(OX)\tktsetup$O \
237	$(OX)\undo$O \
	@@ -247,14 +269,11 @@
247	$(OX)\winhttp$O \
248	$(OX)\wysiwyg$O \
249	$(OX)\xfer$O \
250	$(OX)\xfersetup$O \
251	$(OX)\zip$O \
252	$(OX)\shell$O \
253	$(OX)\sqlite3$O \
254	$(OX)\th$O \
255	$(OX)\th_lang$O
256
257	APPNAME = $(OX)\fossil$(E)
258
259	all: $(OX) $(APPNAME)
260
	@@ -262,11 +281,11 @@
262	@echo Building zlib from "$(ZLIBDIR)"...
263	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264
265	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266	cd $(OX)
267	link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
268
269	$(OX)\linkopts: $B\win\Makefile.msc
270	echo $(OX)\add.obj > $@
271	echo $(OX)\allrepo.obj >> $@
272	echo $(OX)\attach.obj >> $@
	@@ -282,10 +301,11 @@
282	echo $(OX)\clearsign.obj >> $@
283	echo $(OX)\clone.obj >> $@
284	echo $(OX)\comformat.obj >> $@
285	echo $(OX)\configure.obj >> $@
286	echo $(OX)\content.obj >> $@

287	echo $(OX)\db.obj >> $@
288	echo $(OX)\delta.obj >> $@
289	echo $(OX)\deltacmd.obj >> $@
290	echo $(OX)\descendants.obj >> $@
291	echo $(OX)\diff.obj >> $@
	@@ -407,12 +427,12 @@
407	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408	$(TCC) /Fo$@ -c $**
409
410	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411	$** > $@
412	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413	cp $(SRCDIR)\cson_amalgamation.h $@
414
415	page_index.h: mkindex$E $(SRC)
416	$** > $@
417
418	clean:
	@@ -422,10 +442,11 @@
422	-del *.h
423	-del *.map
424	-del *.manifest
425	-del headers
426	-del linkopts

427
428	realclean: clean
429	-del $(APPNAME)
430	-del translate$E
431	-del mkindex$E
	@@ -1070,10 +1091,12 @@
1070	$(TCC) /Fo$@ -c zip_.c
1071
1072	zip_.c : $(SRCDIR)\zip.c
1073	translate$E $** > $@
1074


1075	headers: makeheaders$E page_index.h VERSION.h
1076	makeheaders$E add_.c:add.h \
1077	allrepo_.c:allrepo.h \
1078	attach_.c:attach.h \
1079	bag_.c:bag.h \
1080

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -22,18 +22,35 @@
22
23	# zlib options
24	ZINCDIR = $(B)\compat\zlib
25	ZLIBDIR = $(B)\compat\zlib
26	ZLIB = zlib.lib
27
28	# Uncomment to enable JSON API
29	# FOSSIL_ENABLE_JSON = 1
30
31	# Uncomment to enable markdown support
32	# FOSSIL_ENABLE_MARKDOWN = 1
33
34	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
36	CFLAGS = -nologo -MT -O2
37	BCC = $(CC) $(CFLAGS)
38	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39	RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(ZLIBDIR)
42
43	!ifdef FOSSIL_ENABLE_JSON
44	TCC = $(TCC) -DFOSSIL_ENABLE_JSON
45	RCC = $(RCC) -DFOSSIL_ENABLE_JSON
46	!endif
47
48	!ifdef FOSSIL_ENABLE_MARKDOWN
49	TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
50	RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
51	!endif
52
53	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
54	/DSQLITE_THREADSAFE=0 \
55	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
56	/DSQLITE_ENABLE_STAT3 \
	@@ -160,10 +177,11 @@
177	$(OX)\clearsign$O \
178	$(OX)\clone$O \
179	$(OX)\comformat$O \
180	$(OX)\configure$O \
181	$(OX)\content$O \
182	$(OX)\cson_amalgamation$O \
183	$(OX)\db$O \
184	$(OX)\delta$O \
185	$(OX)\deltacmd$O \
186	$(OX)\descendants$O \
187	$(OX)\diff$O \
	@@ -219,19 +237,23 @@
237	$(OX)\rss$O \
238	$(OX)\schema$O \
239	$(OX)\search$O \
240	$(OX)\setup$O \
241	$(OX)\sha1$O \
242	$(OX)\shell$O \
243	$(OX)\shun$O \
244	$(OX)\skins$O \
245	$(OX)\sqlcmd$O \
246	$(OX)\sqlite3$O \
247	$(OX)\stash$O \
248	$(OX)\stat$O \
249	$(OX)\style$O \
250	$(OX)\sync$O \
251	$(OX)\tag$O \
252	$(OX)\tar$O \
253	$(OX)\th$O \
254	$(OX)\th_lang$O \
255	$(OX)\th_main$O \
256	$(OX)\timeline$O \
257	$(OX)\tkt$O \
258	$(OX)\tktsetup$O \
259	$(OX)\undo$O \
	@@ -247,14 +269,11 @@
269	$(OX)\winhttp$O \
270	$(OX)\wysiwyg$O \
271	$(OX)\xfer$O \
272	$(OX)\xfersetup$O \
273	$(OX)\zip$O \
274	$(OX)\fossil.res



275
276	APPNAME = $(OX)\fossil$(E)
277
278	all: $(OX) $(APPNAME)
279
	@@ -262,11 +281,11 @@
281	@echo Building zlib from "$(ZLIBDIR)"...
282	@pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
283
284	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
285	cd $(OX)
286	link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
287
288	$(OX)\linkopts: $B\win\Makefile.msc
289	echo $(OX)\add.obj > $@
290	echo $(OX)\allrepo.obj >> $@
291	echo $(OX)\attach.obj >> $@
	@@ -282,10 +301,11 @@
301	echo $(OX)\clearsign.obj >> $@
302	echo $(OX)\clone.obj >> $@
303	echo $(OX)\comformat.obj >> $@
304	echo $(OX)\configure.obj >> $@
305	echo $(OX)\content.obj >> $@
306	echo $(OX)\cson_amalgamation.obj >> $@
307	echo $(OX)\db.obj >> $@
308	echo $(OX)\delta.obj >> $@
309	echo $(OX)\deltacmd.obj >> $@
310	echo $(OX)\descendants.obj >> $@
311	echo $(OX)\diff.obj >> $@
	@@ -407,12 +427,12 @@
427	$(OX)\th_lang$O : $(SRCDIR)\th_lang.c
428	$(TCC) /Fo$@ -c $**
429
430	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
431	$** > $@
432	$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
433	$(TCC) /Fo$@ -c $**
434
435	page_index.h: mkindex$E $(SRC)
436	$** > $@
437
438	clean:
	@@ -422,10 +442,11 @@
442	-del *.h
443	-del *.map
444	-del *.manifest
445	-del headers
446	-del linkopts
447	-del *.res
448
449	realclean: clean
450	-del $(APPNAME)
451	-del translate$E
452	-del mkindex$E
	@@ -1070,10 +1091,12 @@
1091	$(TCC) /Fo$@ -c zip_.c
1092
1093	zip_.c : $(SRCDIR)\zip.c
1094	translate$E $** > $@
1095
1096	fossil.res : ..\win\fossil.rc
1097	$(RCC) -fo $@ $**
1098	headers: makeheaders$E page_index.h VERSION.h
1099	makeheaders$E add_.c:add.h \
1100	allrepo_.c:allrepo.h \
1101	attach_.c:attach.h \
1102	bag_.c:bag.h \
1103

Fossil SCM

Keyboard Shortcuts