Fossil SCM

Cleanup makefile for MSVC and add optional Tcl support to it.

mistachkin 2014-02-15 05:23 trunk
Commit 4321595901edb465d327b0255b224428ccb154cf
Parent 43dbc41226a6716…
3 files changed +54 -21 +1 -1 +53 -20
~ src/makemake.tcl ~ src/th.h ~ win/Makefile.msc
M src/makemake.tcl
+54 -21
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1015,54 +1015,78 @@
10151015
 # Uncomment to enable JSON API
10161016
 # FOSSIL_ENABLE_JSON = 1
10171017
10181018
 # Uncomment to enable SSL support
10191019
 # FOSSIL_ENABLE_SSL = 1
1020
+
1021
+# Uncomment to enable Tcl support
1022
+# FOSSIL_ENABLE_TCL = 1
10201023
10211024
 !ifdef FOSSIL_ENABLE_SSL
10221025
 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
10231026
 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
10241027
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10251028
 !endif
1029
+
1030
+!ifdef FOSSIL_ENABLE_TCL
1031
+TCLDIR = $(B)\compat\tcl-8.6
1032
+TCLSRCDIR = $(TCLDIR)
1033
+TCLINCDIR = $(TCLSRCDIR)\generic
1034
+!endif
10261035
10271036
 # zlib options
10281037
 ZINCDIR = $(B)\compat\zlib
10291038
 ZLIBDIR = $(B)\compat\zlib
10301039
 ZLIB = zlib.lib
10311040
1032
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
1041
+INCL = /I. /I$(SRCDIR) /I$B\win\include /I$(ZINCDIR)
10331042
10341043
 !ifdef FOSSIL_ENABLE_SSL
1035
-INCL = $(INCL) -I$(SSLINCDIR)
1044
+INCL = $(INCL) /I$(SSLINCDIR)
1045
+!endif
1046
+
1047
+!ifdef FOSSIL_ENABLE_TCL
1048
+INCL = $(INCL) /I$(TCLINCDIR)
10361049
 !endif
10371050
1038
-CFLAGS = -nologo
1051
+CFLAGS = /nologo
10391052
 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
10401053
10411054
 !ifdef DEBUG
1042
-CFLAGS = $(CFLAGS) -Zi -MTd -Od
1055
+CFLAGS = $(CFLAGS) /Zi /MTd /Od
10431056
 LDFLAGS = $(LDFLAGS) /DEBUG
10441057
 !else
1045
-CFLAGS = $(CFLAGS) -MT -O2
1058
+CFLAGS = $(CFLAGS) /MT /O2
10461059
 !endif
10471060
10481061
 BCC = $(CC) $(CFLAGS)
1049
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1050
-RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1062
+TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
1063
+RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
10511064
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1052
-LIBDIR = -LIBPATH:$(ZLIBDIR)
1065
+LIBDIR = /LIBPATH:$(ZLIBDIR)
10531066
10541067
 !ifdef FOSSIL_ENABLE_JSON
1055
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1056
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1068
+TCC = $(TCC) /DFOSSIL_ENABLE_JSON=1
1069
+RCC = $(RCC) /DFOSSIL_ENABLE_JSON=1
10571070
 !endif
10581071
10591072
 !ifdef FOSSIL_ENABLE_SSL
1060
-TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1061
-RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1073
+TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1074
+RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
10621075
 LIBS = $(LIBS) $(SSLLIB)
1063
-LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1076
+LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1077
+!endif
1078
+
1079
+!ifdef FOSSIL_ENABLE_TCL
1080
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL=1
1081
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL=1
1082
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL_STUBS=1
1083
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL_STUBS=1
1084
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1085
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1086
+TCC = $(TCC) /DUSE_TCL_STUBS=1
1087
+RCC = $(RCC) /DUSE_TCL_STUBS=1
10641088
 !endif
10651089
 }
10661090
 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
10671091
 set j " \\\n "
10681092
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1090,11 +1114,14 @@
10901114
 writeln -nonewline " "
10911115
 }
10921116
 writeln -nonewline "\$(OX)\\$s\$O"; incr i
10931117
 }
10941118
 writeln " \\"
1095
-writeln -nonewline " \$(OX)\\fossil.res\n"
1119
+writeln -nonewline " \$(OX)\\fossil.res\n\n"
1120
+writeln "!ifdef FOSSIL_ENABLE_TCL"
1121
+writeln "OBJ = \$(OBJ) \$(OX)\\th_tcl\$O"
1122
+writeln "!endif"
10961123
 writeln {
10971124
 APPNAME = $(OX)\fossil$(E)
10981125
 PDBNAME = $(OX)\fossil$(P)
10991126
11001127
 all: $(OX) $(APPNAME)
@@ -1103,22 +1130,24 @@
11031130
 @echo Building zlib from "$(ZLIBDIR)"...
11041131
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
11051132
11061133
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
11071134
 cd $(OX)
1108
- link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1135
+ link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
11091136
11101137
 $(OX)\linkopts: $B\win\Makefile.msc}
11111138
 set redir {>}
11121139
 foreach s [lsort [concat $src $AdditionalObj]] {
11131140
 writeln "\techo \$(OX)\\$s.obj $redir \$@"
11141141
 set redir {>>}
11151142
 }
1116
-writeln "\techo \$(LIBS) >> \$@\n\n"
1117
-
1143
+writeln "!ifdef FOSSIL_ENABLE_TCL"
1144
+writeln "\techo \$(OX)\\th_tcl.obj $redir \$@"
1145
+set redir {>>}
1146
+writeln "!endif"
1147
+writeln "\techo \$(LIBS) $redir \$@"
11181148
 writeln {
1119
-
11201149
 $(OX):
11211150
 @-mkdir $@
11221151
11231152
 translate$E: $(SRCDIR)\translate.c
11241153
 $(BCC) $**
@@ -1141,15 +1170,20 @@
11411170
 $(OX)\th$O : $(SRCDIR)\th.c
11421171
 $(TCC) /Fo$@ -c $**
11431172
11441173
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
11451174
 $(TCC) /Fo$@ -c $**
1175
+
1176
+!ifdef FOSSIL_ENABLE_TCL
1177
+$(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
1178
+ $(TCC) /Fo$@ -c $**
1179
+!endif
11461180
11471181
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
11481182
 $** > $@
11491183
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1150
- $(TCC) /Fo$@ -c $**
1184
+ $(TCC) /Fo$@ /c $**
11511185
11521186
 page_index.h: mkindex$E $(SRC)
11531187
 $** > $@
11541188
11551189
 clean:
@@ -1184,21 +1218,20 @@
11841218
 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
11851219
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
11861220
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
11871221
 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
11881222
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
1189
-
11901223
 }
11911224
 foreach s [lsort $src] {
11921225
 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
11931226
 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
11941227
 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
11951228
 writeln "\ttranslate\$E \$** > \$@\n"
11961229
 }
11971230
11981231
 writeln "fossil.res : \$B\\win\\fossil.rc"
1199
-writeln "\t\$(RCC) -fo \$@ \$**"
1232
+writeln "\t\$(RCC) /fo \$@ \$**\n"
12001233
12011234
 writeln "headers: makeheaders\$E page_index.h VERSION.h"
12021235
 writeln -nonewline "\tmakeheaders\$E "
12031236
 set i 0
12041237
 foreach s [lsort $src] {
12051238
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1015,54 +1015,78 @@
1015 # Uncomment to enable JSON API
1016 # FOSSIL_ENABLE_JSON = 1
1017
1018 # Uncomment to enable SSL support
1019 # FOSSIL_ENABLE_SSL = 1
 
 
 
1020
1021 !ifdef FOSSIL_ENABLE_SSL
1022 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1023 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1024 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1025 !endif
 
 
 
 
 
 
1026
1027 # zlib options
1028 ZINCDIR = $(B)\compat\zlib
1029 ZLIBDIR = $(B)\compat\zlib
1030 ZLIB = zlib.lib
1031
1032 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
1033
1034 !ifdef FOSSIL_ENABLE_SSL
1035 INCL = $(INCL) -I$(SSLINCDIR)
 
 
 
 
1036 !endif
1037
1038 CFLAGS = -nologo
1039 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1040
1041 !ifdef DEBUG
1042 CFLAGS = $(CFLAGS) -Zi -MTd -Od
1043 LDFLAGS = $(LDFLAGS) /DEBUG
1044 !else
1045 CFLAGS = $(CFLAGS) -MT -O2
1046 !endif
1047
1048 BCC = $(CC) $(CFLAGS)
1049 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1050 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1051 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1052 LIBDIR = -LIBPATH:$(ZLIBDIR)
1053
1054 !ifdef FOSSIL_ENABLE_JSON
1055 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1056 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1057 !endif
1058
1059 !ifdef FOSSIL_ENABLE_SSL
1060 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1061 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1062 LIBS = $(LIBS) $(SSLLIB)
1063 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
 
 
 
 
 
 
 
 
 
 
 
1064 !endif
1065 }
1066 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1067 set j " \\\n "
1068 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1090,11 +1114,14 @@
1090 writeln -nonewline " "
1091 }
1092 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1093 }
1094 writeln " \\"
1095 writeln -nonewline " \$(OX)\\fossil.res\n"
 
 
 
1096 writeln {
1097 APPNAME = $(OX)\fossil$(E)
1098 PDBNAME = $(OX)\fossil$(P)
1099
1100 all: $(OX) $(APPNAME)
@@ -1103,22 +1130,24 @@
1103 @echo Building zlib from "$(ZLIBDIR)"...
1104 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1105
1106 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1107 cd $(OX)
1108 link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1109
1110 $(OX)\linkopts: $B\win\Makefile.msc}
1111 set redir {>}
1112 foreach s [lsort [concat $src $AdditionalObj]] {
1113 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1114 set redir {>>}
1115 }
1116 writeln "\techo \$(LIBS) >> \$@\n\n"
1117
 
 
 
1118 writeln {
1119
1120 $(OX):
1121 @-mkdir $@
1122
1123 translate$E: $(SRCDIR)\translate.c
1124 $(BCC) $**
@@ -1141,15 +1170,20 @@
1141 $(OX)\th$O : $(SRCDIR)\th.c
1142 $(TCC) /Fo$@ -c $**
1143
1144 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1145 $(TCC) /Fo$@ -c $**
 
 
 
 
 
1146
1147 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1148 $** > $@
1149 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1150 $(TCC) /Fo$@ -c $**
1151
1152 page_index.h: mkindex$E $(SRC)
1153 $** > $@
1154
1155 clean:
@@ -1184,21 +1218,20 @@
1184 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
1185 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
1186 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
1187 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
1188 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
1189
1190 }
1191 foreach s [lsort $src] {
1192 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1193 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1194 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1195 writeln "\ttranslate\$E \$** > \$@\n"
1196 }
1197
1198 writeln "fossil.res : \$B\\win\\fossil.rc"
1199 writeln "\t\$(RCC) -fo \$@ \$**"
1200
1201 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1202 writeln -nonewline "\tmakeheaders\$E "
1203 set i 0
1204 foreach s [lsort $src] {
1205
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1015,54 +1015,78 @@
1015 # Uncomment to enable JSON API
1016 # FOSSIL_ENABLE_JSON = 1
1017
1018 # Uncomment to enable SSL support
1019 # FOSSIL_ENABLE_SSL = 1
1020
1021 # Uncomment to enable Tcl support
1022 # FOSSIL_ENABLE_TCL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 !ifdef FOSSIL_ENABLE_TCL
1031 TCLDIR = $(B)\compat\tcl-8.6
1032 TCLSRCDIR = $(TCLDIR)
1033 TCLINCDIR = $(TCLSRCDIR)\generic
1034 !endif
1035
1036 # zlib options
1037 ZINCDIR = $(B)\compat\zlib
1038 ZLIBDIR = $(B)\compat\zlib
1039 ZLIB = zlib.lib
1040
1041 INCL = /I. /I$(SRCDIR) /I$B\win\include /I$(ZINCDIR)
1042
1043 !ifdef FOSSIL_ENABLE_SSL
1044 INCL = $(INCL) /I$(SSLINCDIR)
1045 !endif
1046
1047 !ifdef FOSSIL_ENABLE_TCL
1048 INCL = $(INCL) /I$(TCLINCDIR)
1049 !endif
1050
1051 CFLAGS = /nologo
1052 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1053
1054 !ifdef DEBUG
1055 CFLAGS = $(CFLAGS) /Zi /MTd /Od
1056 LDFLAGS = $(LDFLAGS) /DEBUG
1057 !else
1058 CFLAGS = $(CFLAGS) /MT /O2
1059 !endif
1060
1061 BCC = $(CC) $(CFLAGS)
1062 TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
1063 RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
1064 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1065 LIBDIR = /LIBPATH:$(ZLIBDIR)
1066
1067 !ifdef FOSSIL_ENABLE_JSON
1068 TCC = $(TCC) /DFOSSIL_ENABLE_JSON=1
1069 RCC = $(RCC) /DFOSSIL_ENABLE_JSON=1
1070 !endif
1071
1072 !ifdef FOSSIL_ENABLE_SSL
1073 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1074 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1075 LIBS = $(LIBS) $(SSLLIB)
1076 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1077 !endif
1078
1079 !ifdef FOSSIL_ENABLE_TCL
1080 TCC = $(TCC) /DFOSSIL_ENABLE_TCL=1
1081 RCC = $(RCC) /DFOSSIL_ENABLE_TCL=1
1082 TCC = $(TCC) /DFOSSIL_ENABLE_TCL_STUBS=1
1083 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_STUBS=1
1084 TCC = $(TCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1085 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1086 TCC = $(TCC) /DUSE_TCL_STUBS=1
1087 RCC = $(RCC) /DUSE_TCL_STUBS=1
1088 !endif
1089 }
1090 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1091 set j " \\\n "
1092 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1090,11 +1114,14 @@
1114 writeln -nonewline " "
1115 }
1116 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1117 }
1118 writeln " \\"
1119 writeln -nonewline " \$(OX)\\fossil.res\n\n"
1120 writeln "!ifdef FOSSIL_ENABLE_TCL"
1121 writeln "OBJ = \$(OBJ) \$(OX)\\th_tcl\$O"
1122 writeln "!endif"
1123 writeln {
1124 APPNAME = $(OX)\fossil$(E)
1125 PDBNAME = $(OX)\fossil$(P)
1126
1127 all: $(OX) $(APPNAME)
@@ -1103,22 +1130,24 @@
1130 @echo Building zlib from "$(ZLIBDIR)"...
1131 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1132
1133 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1134 cd $(OX)
1135 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1136
1137 $(OX)\linkopts: $B\win\Makefile.msc}
1138 set redir {>}
1139 foreach s [lsort [concat $src $AdditionalObj]] {
1140 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1141 set redir {>>}
1142 }
1143 writeln "!ifdef FOSSIL_ENABLE_TCL"
1144 writeln "\techo \$(OX)\\th_tcl.obj $redir \$@"
1145 set redir {>>}
1146 writeln "!endif"
1147 writeln "\techo \$(LIBS) $redir \$@"
1148 writeln {
 
1149 $(OX):
1150 @-mkdir $@
1151
1152 translate$E: $(SRCDIR)\translate.c
1153 $(BCC) $**
@@ -1141,15 +1170,20 @@
1170 $(OX)\th$O : $(SRCDIR)\th.c
1171 $(TCC) /Fo$@ -c $**
1172
1173 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1174 $(TCC) /Fo$@ -c $**
1175
1176 !ifdef FOSSIL_ENABLE_TCL
1177 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
1178 $(TCC) /Fo$@ -c $**
1179 !endif
1180
1181 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1182 $** > $@
1183 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1184 $(TCC) /Fo$@ /c $**
1185
1186 page_index.h: mkindex$E $(SRC)
1187 $** > $@
1188
1189 clean:
@@ -1184,21 +1218,20 @@
1218 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
1219 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
1220 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
1221 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
1222 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
 
1223 }
1224 foreach s [lsort $src] {
1225 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1226 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1227 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1228 writeln "\ttranslate\$E \$** > \$@\n"
1229 }
1230
1231 writeln "fossil.res : \$B\\win\\fossil.rc"
1232 writeln "\t\$(RCC) /fo \$@ \$**\n"
1233
1234 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1235 writeln -nonewline "\tmakeheaders\$E "
1236 set i 0
1237 foreach s [lsort $src] {
1238
M src/th.h
+1 -1
--- src/th.h
+++ src/th.h
@@ -7,15 +7,15 @@
77
 /*
88
 ** Before creating an interpreter, the application must allocate and
99
 ** populate an instance of the following structure. It must remain valid
1010
 ** for the lifetime of the interpreter.
1111
 */
12
+typedef struct Th_Vtab Th_Vtab;
1213
 struct Th_Vtab {
1314
 void *(*xMalloc)(unsigned int);
1415
 void (*xFree)(void *);
1516
 };
16
-typedef struct Th_Vtab Th_Vtab;
1717
1818
 /*
1919
 ** Opaque handle for interpeter.
2020
 */
2121
 typedef struct Th_Interp Th_Interp;
2222
--- src/th.h
+++ src/th.h
@@ -7,15 +7,15 @@
7 /*
8 ** Before creating an interpreter, the application must allocate and
9 ** populate an instance of the following structure. It must remain valid
10 ** for the lifetime of the interpreter.
11 */
 
12 struct Th_Vtab {
13 void *(*xMalloc)(unsigned int);
14 void (*xFree)(void *);
15 };
16 typedef struct Th_Vtab Th_Vtab;
17
18 /*
19 ** Opaque handle for interpeter.
20 */
21 typedef struct Th_Interp Th_Interp;
22
--- src/th.h
+++ src/th.h
@@ -7,15 +7,15 @@
7 /*
8 ** Before creating an interpreter, the application must allocate and
9 ** populate an instance of the following structure. It must remain valid
10 ** for the lifetime of the interpreter.
11 */
12 typedef struct Th_Vtab Th_Vtab;
13 struct Th_Vtab {
14 void *(*xMalloc)(unsigned int);
15 void (*xFree)(void *);
16 };
 
17
18 /*
19 ** Opaque handle for interpeter.
20 */
21 typedef struct Th_Interp Th_Interp;
22
M win/Makefile.msc
+53 -20
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -21,54 +21,78 @@
2121
 # Uncomment to enable JSON API
2222
 # FOSSIL_ENABLE_JSON = 1
2323
2424
 # Uncomment to enable SSL support
2525
 # FOSSIL_ENABLE_SSL = 1
26
+
27
+# Uncomment to enable Tcl support
28
+# FOSSIL_ENABLE_TCL = 1
2629
2730
 !ifdef FOSSIL_ENABLE_SSL
2831
 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
2932
 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
3033
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3134
 !endif
35
+
36
+!ifdef FOSSIL_ENABLE_TCL
37
+TCLDIR = $(B)\compat\tcl-8.6
38
+TCLSRCDIR = $(TCLDIR)
39
+TCLINCDIR = $(TCLSRCDIR)\generic
40
+!endif
3241
3342
 # zlib options
3443
 ZINCDIR = $(B)\compat\zlib
3544
 ZLIBDIR = $(B)\compat\zlib
3645
 ZLIB = zlib.lib
3746
38
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
47
+INCL = /I. /I$(SRCDIR) /I$B\win\include /I$(ZINCDIR)
3948
4049
 !ifdef FOSSIL_ENABLE_SSL
41
-INCL = $(INCL) -I$(SSLINCDIR)
50
+INCL = $(INCL) /I$(SSLINCDIR)
51
+!endif
52
+
53
+!ifdef FOSSIL_ENABLE_TCL
54
+INCL = $(INCL) /I$(TCLINCDIR)
4255
 !endif
4356
44
-CFLAGS = -nologo
57
+CFLAGS = /nologo
4558
 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
4659
4760
 !ifdef DEBUG
48
-CFLAGS = $(CFLAGS) -Zi -MTd -Od
61
+CFLAGS = $(CFLAGS) /Zi /MTd /Od
4962
 LDFLAGS = $(LDFLAGS) /DEBUG
5063
 !else
51
-CFLAGS = $(CFLAGS) -MT -O2
64
+CFLAGS = $(CFLAGS) /MT /O2
5265
 !endif
5366
5467
 BCC = $(CC) $(CFLAGS)
55
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
56
-RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
68
+TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
69
+RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
5770
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
58
-LIBDIR = -LIBPATH:$(ZLIBDIR)
71
+LIBDIR = /LIBPATH:$(ZLIBDIR)
5972
6073
 !ifdef FOSSIL_ENABLE_JSON
61
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
62
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
74
+TCC = $(TCC) /DFOSSIL_ENABLE_JSON=1
75
+RCC = $(RCC) /DFOSSIL_ENABLE_JSON=1
6376
 !endif
6477
6578
 !ifdef FOSSIL_ENABLE_SSL
66
-TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
67
-RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
79
+TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
80
+RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
6881
 LIBS = $(LIBS) $(SSLLIB)
69
-LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
82
+LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
83
+!endif
84
+
85
+!ifdef FOSSIL_ENABLE_TCL
86
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL=1
87
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL=1
88
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL_STUBS=1
89
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL_STUBS=1
90
+TCC = $(TCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
91
+RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
92
+TCC = $(TCC) /DUSE_TCL_STUBS=1
93
+RCC = $(RCC) /DUSE_TCL_STUBS=1
7094
 !endif
7195
7296
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
7397
 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
7498
 /DSQLITE_THREADSAFE=0 \
@@ -302,10 +326,14 @@
302326
 $(OX)\wysiwyg$O \
303327
 $(OX)\xfer$O \
304328
 $(OX)\xfersetup$O \
305329
 $(OX)\zip$O \
306330
 $(OX)\fossil.res
331
+
332
+!ifdef FOSSIL_ENABLE_TCL
333
+OBJ = $(OBJ) $(OX)\th_tcl$O
334
+!endif
307335
308336
 APPNAME = $(OX)\fossil$(E)
309337
 PDBNAME = $(OX)\fossil$(P)
310338
311339
 all: $(OX) $(APPNAME)
@@ -314,11 +342,11 @@
314342
 @echo Building zlib from "$(ZLIBDIR)"...
315343
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
316344
317345
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
318346
 cd $(OX)
319
- link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
347
+ link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
320348
321349
 $(OX)\linkopts: $B\win\Makefile.msc
322350
 echo $(OX)\add.obj > $@
323351
 echo $(OX)\allrepo.obj >> $@
324352
 echo $(OX)\attach.obj >> $@
@@ -430,14 +458,14 @@
430458
 echo $(OX)\winhttp.obj >> $@
431459
 echo $(OX)\wysiwyg.obj >> $@
432460
 echo $(OX)\xfer.obj >> $@
433461
 echo $(OX)\xfersetup.obj >> $@
434462
 echo $(OX)\zip.obj >> $@
463
+!ifdef FOSSIL_ENABLE_TCL
464
+ echo $(OX)\th_tcl.obj >> $@
465
+!endif
435466
 echo $(LIBS) >> $@
436
-
437
-
438
-
439467
440468
 $(OX):
441469
 @-mkdir $@
442470
443471
 translate$E: $(SRCDIR)\translate.c
@@ -461,15 +489,20 @@
461489
 $(OX)\th$O : $(SRCDIR)\th.c
462490
 $(TCC) /Fo$@ -c $**
463491
464492
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
465493
 $(TCC) /Fo$@ -c $**
494
+
495
+!ifdef FOSSIL_ENABLE_TCL
496
+$(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
497
+ $(TCC) /Fo$@ -c $**
498
+!endif
466499
467500
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
468501
 $** > $@
469502
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
470
- $(TCC) /Fo$@ -c $**
503
+ $(TCC) /Fo$@ /c $**
471504
472505
 page_index.h: mkindex$E $(SRC)
473506
 $** > $@
474507
475508
 clean:
@@ -504,11 +537,10 @@
504537
 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
505538
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
506539
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
507540
 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
508541
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
509
-
510542
511543
 $(OX)\add$O : add_.c add.h
512544
 $(TCC) /Fo$@ -c add_.c
513545
514546
 add_.c : $(SRCDIR)\add.c
@@ -1155,11 +1187,12 @@
11551187
11561188
 zip_.c : $(SRCDIR)\zip.c
11571189
 translate$E $** > $@
11581190
11591191
 fossil.res : $B\win\fossil.rc
1160
- $(RCC) -fo $@ $**
1192
+ $(RCC) /fo $@ $**
1193
+
11611194
 headers: makeheaders$E page_index.h VERSION.h
11621195
 makeheaders$E add_.c:add.h \
11631196
 allrepo_.c:allrepo.h \
11641197
 attach_.c:attach.h \
11651198
 bag_.c:bag.h \
11661199
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -21,54 +21,78 @@
21 # Uncomment to enable JSON API
22 # FOSSIL_ENABLE_JSON = 1
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
 
 
 
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
 
 
 
 
 
 
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35 ZLIBDIR = $(B)\compat\zlib
36 ZLIB = zlib.lib
37
38 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
39
40 !ifdef FOSSIL_ENABLE_SSL
41 INCL = $(INCL) -I$(SSLINCDIR)
 
 
 
 
42 !endif
43
44 CFLAGS = -nologo
45 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
46
47 !ifdef DEBUG
48 CFLAGS = $(CFLAGS) -Zi -MTd -Od
49 LDFLAGS = $(LDFLAGS) /DEBUG
50 !else
51 CFLAGS = $(CFLAGS) -MT -O2
52 !endif
53
54 BCC = $(CC) $(CFLAGS)
55 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
56 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
57 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
58 LIBDIR = -LIBPATH:$(ZLIBDIR)
59
60 !ifdef FOSSIL_ENABLE_JSON
61 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
62 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
63 !endif
64
65 !ifdef FOSSIL_ENABLE_SSL
66 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
67 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
68 LIBS = $(LIBS) $(SSLLIB)
69 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
 
 
 
 
 
 
 
 
 
 
 
70 !endif
71
72 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
73 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
74 /DSQLITE_THREADSAFE=0 \
@@ -302,10 +326,14 @@
302 $(OX)\wysiwyg$O \
303 $(OX)\xfer$O \
304 $(OX)\xfersetup$O \
305 $(OX)\zip$O \
306 $(OX)\fossil.res
 
 
 
 
307
308 APPNAME = $(OX)\fossil$(E)
309 PDBNAME = $(OX)\fossil$(P)
310
311 all: $(OX) $(APPNAME)
@@ -314,11 +342,11 @@
314 @echo Building zlib from "$(ZLIBDIR)"...
315 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
316
317 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
318 cd $(OX)
319 link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
320
321 $(OX)\linkopts: $B\win\Makefile.msc
322 echo $(OX)\add.obj > $@
323 echo $(OX)\allrepo.obj >> $@
324 echo $(OX)\attach.obj >> $@
@@ -430,14 +458,14 @@
430 echo $(OX)\winhttp.obj >> $@
431 echo $(OX)\wysiwyg.obj >> $@
432 echo $(OX)\xfer.obj >> $@
433 echo $(OX)\xfersetup.obj >> $@
434 echo $(OX)\zip.obj >> $@
 
 
 
435 echo $(LIBS) >> $@
436
437
438
439
440 $(OX):
441 @-mkdir $@
442
443 translate$E: $(SRCDIR)\translate.c
@@ -461,15 +489,20 @@
461 $(OX)\th$O : $(SRCDIR)\th.c
462 $(TCC) /Fo$@ -c $**
463
464 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
465 $(TCC) /Fo$@ -c $**
 
 
 
 
 
466
467 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
468 $** > $@
469 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
470 $(TCC) /Fo$@ -c $**
471
472 page_index.h: mkindex$E $(SRC)
473 $** > $@
474
475 clean:
@@ -504,11 +537,10 @@
504 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
505 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
506 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
507 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
508 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
509
510
511 $(OX)\add$O : add_.c add.h
512 $(TCC) /Fo$@ -c add_.c
513
514 add_.c : $(SRCDIR)\add.c
@@ -1155,11 +1187,12 @@
1155
1156 zip_.c : $(SRCDIR)\zip.c
1157 translate$E $** > $@
1158
1159 fossil.res : $B\win\fossil.rc
1160 $(RCC) -fo $@ $**
 
1161 headers: makeheaders$E page_index.h VERSION.h
1162 makeheaders$E add_.c:add.h \
1163 allrepo_.c:allrepo.h \
1164 attach_.c:attach.h \
1165 bag_.c:bag.h \
1166
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -21,54 +21,78 @@
21 # Uncomment to enable JSON API
22 # FOSSIL_ENABLE_JSON = 1
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 # Uncomment to enable Tcl support
28 # FOSSIL_ENABLE_TCL = 1
29
30 !ifdef FOSSIL_ENABLE_SSL
31 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
32 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
33 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
34 !endif
35
36 !ifdef FOSSIL_ENABLE_TCL
37 TCLDIR = $(B)\compat\tcl-8.6
38 TCLSRCDIR = $(TCLDIR)
39 TCLINCDIR = $(TCLSRCDIR)\generic
40 !endif
41
42 # zlib options
43 ZINCDIR = $(B)\compat\zlib
44 ZLIBDIR = $(B)\compat\zlib
45 ZLIB = zlib.lib
46
47 INCL = /I. /I$(SRCDIR) /I$B\win\include /I$(ZINCDIR)
48
49 !ifdef FOSSIL_ENABLE_SSL
50 INCL = $(INCL) /I$(SSLINCDIR)
51 !endif
52
53 !ifdef FOSSIL_ENABLE_TCL
54 INCL = $(INCL) /I$(TCLINCDIR)
55 !endif
56
57 CFLAGS = /nologo
58 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
59
60 !ifdef DEBUG
61 CFLAGS = $(CFLAGS) /Zi /MTd /Od
62 LDFLAGS = $(LDFLAGS) /DEBUG
63 !else
64 CFLAGS = $(CFLAGS) /MT /O2
65 !endif
66
67 BCC = $(CC) $(CFLAGS)
68 TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
69 RCC = rc /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
70 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
71 LIBDIR = /LIBPATH:$(ZLIBDIR)
72
73 !ifdef FOSSIL_ENABLE_JSON
74 TCC = $(TCC) /DFOSSIL_ENABLE_JSON=1
75 RCC = $(RCC) /DFOSSIL_ENABLE_JSON=1
76 !endif
77
78 !ifdef FOSSIL_ENABLE_SSL
79 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
80 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
81 LIBS = $(LIBS) $(SSLLIB)
82 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
83 !endif
84
85 !ifdef FOSSIL_ENABLE_TCL
86 TCC = $(TCC) /DFOSSIL_ENABLE_TCL=1
87 RCC = $(RCC) /DFOSSIL_ENABLE_TCL=1
88 TCC = $(TCC) /DFOSSIL_ENABLE_TCL_STUBS=1
89 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_STUBS=1
90 TCC = $(TCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
91 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
92 TCC = $(TCC) /DUSE_TCL_STUBS=1
93 RCC = $(RCC) /DUSE_TCL_STUBS=1
94 !endif
95
96 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
97 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
98 /DSQLITE_THREADSAFE=0 \
@@ -302,10 +326,14 @@
326 $(OX)\wysiwyg$O \
327 $(OX)\xfer$O \
328 $(OX)\xfersetup$O \
329 $(OX)\zip$O \
330 $(OX)\fossil.res
331
332 !ifdef FOSSIL_ENABLE_TCL
333 OBJ = $(OBJ) $(OX)\th_tcl$O
334 !endif
335
336 APPNAME = $(OX)\fossil$(E)
337 PDBNAME = $(OX)\fossil$(P)
338
339 all: $(OX) $(APPNAME)
@@ -314,11 +342,11 @@
342 @echo Building zlib from "$(ZLIBDIR)"...
343 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
344
345 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
346 cd $(OX)
347 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
348
349 $(OX)\linkopts: $B\win\Makefile.msc
350 echo $(OX)\add.obj > $@
351 echo $(OX)\allrepo.obj >> $@
352 echo $(OX)\attach.obj >> $@
@@ -430,14 +458,14 @@
458 echo $(OX)\winhttp.obj >> $@
459 echo $(OX)\wysiwyg.obj >> $@
460 echo $(OX)\xfer.obj >> $@
461 echo $(OX)\xfersetup.obj >> $@
462 echo $(OX)\zip.obj >> $@
463 !ifdef FOSSIL_ENABLE_TCL
464 echo $(OX)\th_tcl.obj >> $@
465 !endif
466 echo $(LIBS) >> $@
 
 
 
467
468 $(OX):
469 @-mkdir $@
470
471 translate$E: $(SRCDIR)\translate.c
@@ -461,15 +489,20 @@
489 $(OX)\th$O : $(SRCDIR)\th.c
490 $(TCC) /Fo$@ -c $**
491
492 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
493 $(TCC) /Fo$@ -c $**
494
495 !ifdef FOSSIL_ENABLE_TCL
496 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
497 $(TCC) /Fo$@ -c $**
498 !endif
499
500 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
501 $** > $@
502 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
503 $(TCC) /Fo$@ /c $**
504
505 page_index.h: mkindex$E $(SRC)
506 $** > $@
507
508 clean:
@@ -504,11 +537,10 @@
537 $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h
538 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
539 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
540 $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
541 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
 
542
543 $(OX)\add$O : add_.c add.h
544 $(TCC) /Fo$@ -c add_.c
545
546 add_.c : $(SRCDIR)\add.c
@@ -1155,11 +1187,12 @@
1187
1188 zip_.c : $(SRCDIR)\zip.c
1189 translate$E $** > $@
1190
1191 fossil.res : $B\win\fossil.rc
1192 $(RCC) /fo $@ $**
1193
1194 headers: makeheaders$E page_index.h VERSION.h
1195 makeheaders$E add_.c:add.h \
1196 allrepo_.c:allrepo.h \
1197 attach_.c:attach.h \
1198 bag_.c:bag.h \
1199

Keyboard Shortcuts

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