Fossil SCM

Modify the makefiles to provide for compile-time options for pikchr. Reduce the token-count limit in pikchr to 10,000.

drh 2022-04-05 15:04 trunk
Commit 959807e91502d64467fcadade0655483e38dfa6d89e752058b19c2d8feae7e7b
Parent f7530419619d7e6…
5 files changed +4 -1 +21 -4 +2 +34 -32 +3 -1
~ src/main.mk ~ tools/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M src/main.mk
+4 -1
--- src/main.mk
+++ src/main.mk
@@ -675,10 +675,13 @@
675675
 -DSQLITE_SHELL_IS_UTF8=1 \
676676
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
677677
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
678678
 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
679679
 -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc
680
+
681
+# Setup the options used to compile the included Pikchr formatter.
682
+PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
680683
681684
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
682685
 # If it is set to 1, then there is no need to build or link
683686
 # the sqlite3.o object. Instead, the system SQLite will be linked
684687
 # using -lsqlite3.
@@ -2101,11 +2104,11 @@
21012104
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
21022105
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
21032106
21042107
21052108
 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2106
- $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2109
+ $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
21072110
21082111
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
21092112
 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
21102113
21112114
 #
21122115
--- src/main.mk
+++ src/main.mk
@@ -675,10 +675,13 @@
675 -DSQLITE_SHELL_IS_UTF8=1 \
676 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
677 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
678 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
679 -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc
 
 
 
680
681 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
682 # If it is set to 1, then there is no need to build or link
683 # the sqlite3.o object. Instead, the system SQLite will be linked
684 # using -lsqlite3.
@@ -2101,11 +2104,11 @@
2101 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2102 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2103
2104
2105 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2106 $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2107
2108 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2109 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2110
2111 #
2112
--- src/main.mk
+++ src/main.mk
@@ -675,10 +675,13 @@
675 -DSQLITE_SHELL_IS_UTF8=1 \
676 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
677 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
678 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
679 -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc
680
681 # Setup the options used to compile the included Pikchr formatter.
682 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
683
684 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
685 # If it is set to 1, then there is no need to build or link
686 # the sqlite3.o object. Instead, the system SQLite will be linked
687 # using -lsqlite3.
@@ -2101,11 +2104,11 @@
2104 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2105 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2106
2107
2108 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2109 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2110
2111 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2112 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2113
2114 #
2115
M tools/makemake.tcl
+21 -4
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -249,10 +249,16 @@
249249
 }
250250
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
251251
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
252252
 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
253253
 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
254
+
255
+# Options used to compile the Pikchr library.
256
+#
257
+set PIKCHR_OPTIONS {
258
+ -DPIKCHR_TOKEN_LIMIT=10000
259
+}
254260
255261
 # Options used to compile the included SQLite shell.
256262
 #
257263
 set SHELL_OPTIONS [concat $SQLITE_OPTIONS {
258264
 -Dmain=sqlite3_shell
@@ -354,10 +360,11 @@
354360
 }
355361
356362
 writeln [string map [list \
357363
 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
358364
 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
365
+ <<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
359366
 <<<NEXT_LINE>>> \\] {
360367
 all: $(OBJDIR) $(APPNAME)
361368
362369
 install: all
363370
 mkdir -p $(INSTALLDIR)
@@ -414,10 +421,13 @@
414421
 # Setup the options used to compile the included SQLite library.
415422
 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
416423
417424
 # Setup the options used to compile the included SQLite shell.
418425
 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
426
+
427
+# Setup the options used to compile the included Pikchr formatter.
428
+PIKCHR_OPTIONS = <<<PIKCHR_OPTIONS>>>
419429
420430
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
421431
 # If it is set to 1, then there is no need to build or link
422432
 # the sqlite3.o object. Instead, the system SQLite will be linked
423433
 # using -lsqlite3.
@@ -544,11 +554,11 @@
544554
 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
545555
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
546556
547557
 writeln {
548558
 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
549
- $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
559
+ $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
550560
551561
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
552562
 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
553563
554564
 #
@@ -1247,14 +1257,16 @@
12471257
 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
12481258
 lappend MINGW_SQLITE_OPTIONS {$(MINGW_OPTIONS)}
12491259
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
12501260
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
12511261
1262
+set MINGW_PIKCHR_OPTIONS $PIKCHR_OPTIONS
1263
+
12521264
 set j " \\\n "
12531265
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
1254
-set j " \\\n "
12551266
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
1267
+writeln "PIKCHR_OPTIONS = [join $MINGW_PIKCHR_OPTIONS $j]\n"
12561268
12571269
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
12581270
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
12591271
 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
12601272
@@ -1273,11 +1285,11 @@
12731285
12741286
 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
12751287
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
12761288
12771289
 writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR_extsrc)/pikchr.c"
1278
-writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
1290
+writeln "\t\$(XTCC) \$(PIKCHR_OPTIONS) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
12791291
12801292
 close $output_file
12811293
 #
12821294
 # End of the win/Makefile.mingw output
12831295
 ##############################################################################
@@ -1319,10 +1331,11 @@
13191331
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
13201332
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
13211333
 }
13221334
 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
13231335
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
1336
+writeln "PIKCHR_OPTIONS = [join $PIKCHR_OPTIONS { }]\n"
13241337
 writeln -nonewline "SRC ="
13251338
 foreach s [lsort $src] {
13261339
 writeln -nonewline " ${s}_.c"
13271340
 }
13281341
 writeln "\n"
@@ -1763,10 +1776,14 @@
17631776
17641777
 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
17651778
 set j " \\\n "
17661779
 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
17671780
1781
+regsub -all {[-]D} [join $PIKCHR_OPTIONS { }] {/D} MSC_PIKCHR_OPTIONS
1782
+set j " \\\n "
1783
+writeln "PIKCHR_OPTIONS = [join $MSC_PIKCHR_OPTIONS $j]\n"
1784
+
17681785
 writeln -nonewline "SRC = "
17691786
 set i 0
17701787
 foreach s [lsort $src] {
17711788
 if {$i > 0} {
17721789
 writeln " \\"
@@ -1948,11 +1965,11 @@
19481965
19491966
 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
19501967
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
19511968
19521969
 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1953
- $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1970
+ $(TCC) $(PIKCHR_OPTIONS) /Fo$@ /Fd$(@D)\ -c $**
19541971
19551972
 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
19561973
 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
19571974
19581975
 "$(B)\phony.h" :
19591976
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -249,10 +249,16 @@
249 }
250 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
251 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
252 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
253 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
 
 
 
 
 
 
254
255 # Options used to compile the included SQLite shell.
256 #
257 set SHELL_OPTIONS [concat $SQLITE_OPTIONS {
258 -Dmain=sqlite3_shell
@@ -354,10 +360,11 @@
354 }
355
356 writeln [string map [list \
357 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
358 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
 
359 <<<NEXT_LINE>>> \\] {
360 all: $(OBJDIR) $(APPNAME)
361
362 install: all
363 mkdir -p $(INSTALLDIR)
@@ -414,10 +421,13 @@
414 # Setup the options used to compile the included SQLite library.
415 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
416
417 # Setup the options used to compile the included SQLite shell.
418 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
 
 
 
419
420 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
421 # If it is set to 1, then there is no need to build or link
422 # the sqlite3.o object. Instead, the system SQLite will be linked
423 # using -lsqlite3.
@@ -544,11 +554,11 @@
544 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
545 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
546
547 writeln {
548 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
549 $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
550
551 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
552 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
553
554 #
@@ -1247,14 +1257,16 @@
1247 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
1248 lappend MINGW_SQLITE_OPTIONS {$(MINGW_OPTIONS)}
1249 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
1250 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
1251
 
 
1252 set j " \\\n "
1253 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
1254 set j " \\\n "
1255 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
 
1256
1257 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1258 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1259 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1260
@@ -1273,11 +1285,11 @@
1273
1274 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
1275 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
1276
1277 writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR_extsrc)/pikchr.c"
1278 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
1279
1280 close $output_file
1281 #
1282 # End of the win/Makefile.mingw output
1283 ##############################################################################
@@ -1319,10 +1331,11 @@
1319 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
1320 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
1321 }
1322 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
1323 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
 
1324 writeln -nonewline "SRC ="
1325 foreach s [lsort $src] {
1326 writeln -nonewline " ${s}_.c"
1327 }
1328 writeln "\n"
@@ -1763,10 +1776,14 @@
1763
1764 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1765 set j " \\\n "
1766 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1767
 
 
 
 
1768 writeln -nonewline "SRC = "
1769 set i 0
1770 foreach s [lsort $src] {
1771 if {$i > 0} {
1772 writeln " \\"
@@ -1948,11 +1965,11 @@
1948
1949 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1950 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1951
1952 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1953 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1954
1955 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1956 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1957
1958 "$(B)\phony.h" :
1959
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -249,10 +249,16 @@
249 }
250 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
251 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
252 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
253 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
254
255 # Options used to compile the Pikchr library.
256 #
257 set PIKCHR_OPTIONS {
258 -DPIKCHR_TOKEN_LIMIT=10000
259 }
260
261 # Options used to compile the included SQLite shell.
262 #
263 set SHELL_OPTIONS [concat $SQLITE_OPTIONS {
264 -Dmain=sqlite3_shell
@@ -354,10 +360,11 @@
360 }
361
362 writeln [string map [list \
363 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
364 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
365 <<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
366 <<<NEXT_LINE>>> \\] {
367 all: $(OBJDIR) $(APPNAME)
368
369 install: all
370 mkdir -p $(INSTALLDIR)
@@ -414,10 +421,13 @@
421 # Setup the options used to compile the included SQLite library.
422 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
423
424 # Setup the options used to compile the included SQLite shell.
425 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
426
427 # Setup the options used to compile the included Pikchr formatter.
428 PIKCHR_OPTIONS = <<<PIKCHR_OPTIONS>>>
429
430 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
431 # If it is set to 1, then there is no need to build or link
432 # the sqlite3.o object. Instead, the system SQLite will be linked
433 # using -lsqlite3.
@@ -544,11 +554,11 @@
554 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
555 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
556
557 writeln {
558 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
559 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
560
561 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
562 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
563
564 #
@@ -1247,14 +1257,16 @@
1257 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
1258 lappend MINGW_SQLITE_OPTIONS {$(MINGW_OPTIONS)}
1259 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
1260 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
1261
1262 set MINGW_PIKCHR_OPTIONS $PIKCHR_OPTIONS
1263
1264 set j " \\\n "
1265 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
 
1266 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
1267 writeln "PIKCHR_OPTIONS = [join $MINGW_PIKCHR_OPTIONS $j]\n"
1268
1269 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1270 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1271 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1272
@@ -1273,11 +1285,11 @@
1285
1286 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
1287 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
1288
1289 writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR_extsrc)/pikchr.c"
1290 writeln "\t\$(XTCC) \$(PIKCHR_OPTIONS) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
1291
1292 close $output_file
1293 #
1294 # End of the win/Makefile.mingw output
1295 ##############################################################################
@@ -1319,10 +1331,11 @@
1331 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
1332 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
1333 }
1334 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
1335 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
1336 writeln "PIKCHR_OPTIONS = [join $PIKCHR_OPTIONS { }]\n"
1337 writeln -nonewline "SRC ="
1338 foreach s [lsort $src] {
1339 writeln -nonewline " ${s}_.c"
1340 }
1341 writeln "\n"
@@ -1763,10 +1776,14 @@
1776
1777 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1778 set j " \\\n "
1779 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1780
1781 regsub -all {[-]D} [join $PIKCHR_OPTIONS { }] {/D} MSC_PIKCHR_OPTIONS
1782 set j " \\\n "
1783 writeln "PIKCHR_OPTIONS = [join $MSC_PIKCHR_OPTIONS $j]\n"
1784
1785 writeln -nonewline "SRC = "
1786 set i 0
1787 foreach s [lsort $src] {
1788 if {$i > 0} {
1789 writeln " \\"
@@ -1948,11 +1965,11 @@
1965
1966 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1967 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1968
1969 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1970 $(TCC) $(PIKCHR_OPTIONS) /Fo$@ /Fd$(@D)\ -c $**
1971
1972 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1973 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1974
1975 "$(B)\phony.h" :
1976
M win/Makefile.dmc
+2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,10 +29,12 @@
2929
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
3030
3131
 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
3232
3333
 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
+
35
+PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
3436
3537
 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
3638
3739
 OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\loadctrl$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)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3840
3941
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,10 +29,12 @@
29 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
32
33 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
 
 
34
35 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
36
37 OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\loadctrl$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)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
38
39
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,10 +29,12 @@
29 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
32
33 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
35 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39 OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\loadctrl$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)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
40
41
M win/Makefile.mingw
+34 -32
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2528,41 +2528,43 @@
25282528
 $(MINGW_OPTIONS) \
25292529
 -DSQLITE_USE_MALLOC_H \
25302530
 -DSQLITE_USE_MSIZE
25312531
25322532
 SHELL_OPTIONS = -DNDEBUG=1 \
2533
- -DSQLITE_DQS=0 \
2534
- -DSQLITE_THREADSAFE=0 \
2535
- -DSQLITE_DEFAULT_MEMSTATUS=0 \
2536
- -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2537
- -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2538
- -DSQLITE_OMIT_DECLTYPE \
2539
- -DSQLITE_OMIT_DEPRECATED \
2540
- -DSQLITE_OMIT_PROGRESS_CALLBACK \
2541
- -DSQLITE_OMIT_SHARED_CACHE \
2542
- -DSQLITE_OMIT_LOAD_EXTENSION \
2543
- -DSQLITE_MAX_EXPR_DEPTH=0 \
2544
- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2545
- -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2546
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2547
- -DSQLITE_ENABLE_FTS4 \
2548
- -DSQLITE_ENABLE_DBSTAT_VTAB \
2549
- -DSQLITE_ENABLE_FTS5 \
2550
- -DSQLITE_ENABLE_STMTVTAB \
2551
- -DSQLITE_HAVE_ZLIB \
2552
- -DSQLITE_ENABLE_DBPAGE_VTAB \
2553
- -DSQLITE_TRUSTED_SCHEMA=0 \
2554
- -Dmain=sqlite3_shell \
2555
- -DSQLITE_SHELL_IS_UTF8=1 \
2556
- -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2557
- -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2558
- -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2559
- -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc \
2560
- -Daccess=file_access \
2561
- -Dsystem=fossil_system \
2562
- -Dgetenv=fossil_getenv \
2563
- -Dfopen=fossil_fopen
2533
+ -DSQLITE_DQS=0 \
2534
+ -DSQLITE_THREADSAFE=0 \
2535
+ -DSQLITE_DEFAULT_MEMSTATUS=0 \
2536
+ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2537
+ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2538
+ -DSQLITE_OMIT_DECLTYPE \
2539
+ -DSQLITE_OMIT_DEPRECATED \
2540
+ -DSQLITE_OMIT_PROGRESS_CALLBACK \
2541
+ -DSQLITE_OMIT_SHARED_CACHE \
2542
+ -DSQLITE_OMIT_LOAD_EXTENSION \
2543
+ -DSQLITE_MAX_EXPR_DEPTH=0 \
2544
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2545
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2546
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2547
+ -DSQLITE_ENABLE_FTS4 \
2548
+ -DSQLITE_ENABLE_DBSTAT_VTAB \
2549
+ -DSQLITE_ENABLE_FTS5 \
2550
+ -DSQLITE_ENABLE_STMTVTAB \
2551
+ -DSQLITE_HAVE_ZLIB \
2552
+ -DSQLITE_ENABLE_DBPAGE_VTAB \
2553
+ -DSQLITE_TRUSTED_SCHEMA=0 \
2554
+ -Dmain=sqlite3_shell \
2555
+ -DSQLITE_SHELL_IS_UTF8=1 \
2556
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2557
+ -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2558
+ -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2559
+ -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc \
2560
+ -Daccess=file_access \
2561
+ -Dsystem=fossil_system \
2562
+ -Dgetenv=fossil_getenv \
2563
+ -Dfopen=fossil_fopen
2564
+
2565
+PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
25642566
25652567
 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
25662568
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
25672569
 -c $(SQLITE3_SRC) -o $@
25682570
@@ -2582,7 +2584,7 @@
25822584
25832585
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
25842586
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
25852587
25862588
 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2587
- $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2589
+ $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
25882590
25892591
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2528,41 +2528,43 @@
2528 $(MINGW_OPTIONS) \
2529 -DSQLITE_USE_MALLOC_H \
2530 -DSQLITE_USE_MSIZE
2531
2532 SHELL_OPTIONS = -DNDEBUG=1 \
2533 -DSQLITE_DQS=0 \
2534 -DSQLITE_THREADSAFE=0 \
2535 -DSQLITE_DEFAULT_MEMSTATUS=0 \
2536 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2537 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2538 -DSQLITE_OMIT_DECLTYPE \
2539 -DSQLITE_OMIT_DEPRECATED \
2540 -DSQLITE_OMIT_PROGRESS_CALLBACK \
2541 -DSQLITE_OMIT_SHARED_CACHE \
2542 -DSQLITE_OMIT_LOAD_EXTENSION \
2543 -DSQLITE_MAX_EXPR_DEPTH=0 \
2544 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2545 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2546 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2547 -DSQLITE_ENABLE_FTS4 \
2548 -DSQLITE_ENABLE_DBSTAT_VTAB \
2549 -DSQLITE_ENABLE_FTS5 \
2550 -DSQLITE_ENABLE_STMTVTAB \
2551 -DSQLITE_HAVE_ZLIB \
2552 -DSQLITE_ENABLE_DBPAGE_VTAB \
2553 -DSQLITE_TRUSTED_SCHEMA=0 \
2554 -Dmain=sqlite3_shell \
2555 -DSQLITE_SHELL_IS_UTF8=1 \
2556 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2557 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2558 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2559 -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc \
2560 -Daccess=file_access \
2561 -Dsystem=fossil_system \
2562 -Dgetenv=fossil_getenv \
2563 -Dfopen=fossil_fopen
 
 
2564
2565 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2566 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2567 -c $(SQLITE3_SRC) -o $@
2568
@@ -2582,7 +2584,7 @@
2582
2583 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2584 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2585
2586 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2587 $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2588
2589
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2528,41 +2528,43 @@
2528 $(MINGW_OPTIONS) \
2529 -DSQLITE_USE_MALLOC_H \
2530 -DSQLITE_USE_MSIZE
2531
2532 SHELL_OPTIONS = -DNDEBUG=1 \
2533 -DSQLITE_DQS=0 \
2534 -DSQLITE_THREADSAFE=0 \
2535 -DSQLITE_DEFAULT_MEMSTATUS=0 \
2536 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2537 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2538 -DSQLITE_OMIT_DECLTYPE \
2539 -DSQLITE_OMIT_DEPRECATED \
2540 -DSQLITE_OMIT_PROGRESS_CALLBACK \
2541 -DSQLITE_OMIT_SHARED_CACHE \
2542 -DSQLITE_OMIT_LOAD_EXTENSION \
2543 -DSQLITE_MAX_EXPR_DEPTH=0 \
2544 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2545 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2546 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2547 -DSQLITE_ENABLE_FTS4 \
2548 -DSQLITE_ENABLE_DBSTAT_VTAB \
2549 -DSQLITE_ENABLE_FTS5 \
2550 -DSQLITE_ENABLE_STMTVTAB \
2551 -DSQLITE_HAVE_ZLIB \
2552 -DSQLITE_ENABLE_DBPAGE_VTAB \
2553 -DSQLITE_TRUSTED_SCHEMA=0 \
2554 -Dmain=sqlite3_shell \
2555 -DSQLITE_SHELL_IS_UTF8=1 \
2556 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2557 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2558 -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname \
2559 -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc \
2560 -Daccess=file_access \
2561 -Dsystem=fossil_system \
2562 -Dgetenv=fossil_getenv \
2563 -Dfopen=fossil_fopen
2564
2565 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
2566
2567 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2568 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2569 -c $(SQLITE3_SRC) -o $@
2570
@@ -2582,7 +2584,7 @@
2584
2585 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2586 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2587
2588 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2589 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2590
2591
M win/Makefile.msc
+3 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -354,10 +354,12 @@
354354
 /Daccess=file_access \
355355
 /Dsystem=fossil_system \
356356
 /Dgetenv=fossil_getenv \
357357
 /Dfopen=fossil_fopen
358358
359
+PIKCHR_OPTIONS = /DPIKCHR_TOKEN_LIMIT=10000
360
+
359361
 SRC = "$(OX)\add_.c" \
360362
 "$(OX)\ajax_.c" \
361363
 "$(OX)\alerts_.c" \
362364
 "$(OX)\allrepo_.c" \
363365
 "$(OX)\attach_.c" \
@@ -1060,11 +1062,11 @@
10601062
10611063
 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
10621064
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
10631065
10641066
 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1065
- $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1067
+ $(TCC) $(PIKCHR_OPTIONS) /Fo$@ /Fd$(@D)\ -c $**
10661068
10671069
 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
10681070
 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
10691071
10701072
 "$(B)\phony.h" :
10711073
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -354,10 +354,12 @@
354 /Daccess=file_access \
355 /Dsystem=fossil_system \
356 /Dgetenv=fossil_getenv \
357 /Dfopen=fossil_fopen
358
 
 
359 SRC = "$(OX)\add_.c" \
360 "$(OX)\ajax_.c" \
361 "$(OX)\alerts_.c" \
362 "$(OX)\allrepo_.c" \
363 "$(OX)\attach_.c" \
@@ -1060,11 +1062,11 @@
1060
1061 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1062 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1063
1064 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1065 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1066
1067 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1068 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1069
1070 "$(B)\phony.h" :
1071
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -354,10 +354,12 @@
354 /Daccess=file_access \
355 /Dsystem=fossil_system \
356 /Dgetenv=fossil_getenv \
357 /Dfopen=fossil_fopen
358
359 PIKCHR_OPTIONS = /DPIKCHR_TOKEN_LIMIT=10000
360
361 SRC = "$(OX)\add_.c" \
362 "$(OX)\ajax_.c" \
363 "$(OX)\alerts_.c" \
364 "$(OX)\allrepo_.c" \
365 "$(OX)\attach_.c" \
@@ -1060,11 +1062,11 @@
1062
1063 "$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1064 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1065
1066 "$(OX)\pikchr$O" : "$(SRCDIR_extsrc)\pikchr.c"
1067 $(TCC) $(PIKCHR_OPTIONS) /Fo$@ /Fd$(@D)\ -c $**
1068
1069 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1070 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1071
1072 "$(B)\phony.h" :
1073

Keyboard Shortcuts

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