Fossil SCM

Cleanup compiler option handling in the MinGW makefiles as well.

mistachkin 2013-12-13 08:31 trunk
Commit d0a9cda5606ae4d56dd87896bbe8e5ab1e37844f
Parent 1395315639037af…
4 files changed +6 -6 +13 -11 +20 -3 +20 -3
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/main.mk
+6 -6
--- src/main.mk
+++ src/main.mk
@@ -374,16 +374,16 @@
374374
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375375
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376376
377377
 # Setup the options used to compile the included SQLite library.
378378
 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379
- -DSQLITE_THREADSAFE=0 \
380
- -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381
- -DSQLITE_OMIT_DEPRECATED \
382
- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383
- -Dlocaltime=fossil_localtime \
384
- -DSQLITE_ENABLE_LOCKING_STYLE=0
379
+ -DSQLITE_THREADSAFE=0 \
380
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381
+ -DSQLITE_OMIT_DEPRECATED \
382
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383
+ -Dlocaltime=fossil_localtime \
384
+ -DSQLITE_ENABLE_LOCKING_STYLE=0
385385
386386
 # Setup the options used to compile the included SQLite shell.
387387
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
388388
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389389
 -Dsqlite3_strglob=strglob
390390
--- src/main.mk
+++ src/main.mk
@@ -374,16 +374,16 @@
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
377 # Setup the options used to compile the included SQLite library.
378 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379 -DSQLITE_THREADSAFE=0 \
380 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381 -DSQLITE_OMIT_DEPRECATED \
382 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383 -Dlocaltime=fossil_localtime \
384 -DSQLITE_ENABLE_LOCKING_STYLE=0
385
386 # Setup the options used to compile the included SQLite shell.
387 SHELL_OPTIONS = -Dmain=sqlite3_shell \
388 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389 -Dsqlite3_strglob=strglob
390
--- src/main.mk
+++ src/main.mk
@@ -374,16 +374,16 @@
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
377 # Setup the options used to compile the included SQLite library.
378 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379 -DSQLITE_THREADSAFE=0 \
380 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381 -DSQLITE_OMIT_DEPRECATED \
382 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383 -Dlocaltime=fossil_localtime \
384 -DSQLITE_ENABLE_LOCKING_STYLE=0
385
386 # Setup the options used to compile the included SQLite shell.
387 SHELL_OPTIONS = -Dmain=sqlite3_shell \
388 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389 -Dsqlite3_strglob=strglob
390
M src/makemake.tcl
+13 -11
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -217,11 +217,11 @@
217217
 writeln "\n"
218218
 writeln "APPNAME = $name\$(E)"
219219
 writeln "\n"
220220
221221
 writeln [string map [list \
222
- <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
222
+ <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223223
 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
224224
 all: $(OBJDIR) $(APPNAME)
225225
226226
 install: $(APPNAME)
227227
 mkdir -p $(INSTALLDIR)
@@ -336,11 +336,10 @@
336336
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
337337
338338
 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
339339
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
340340
341
-set opt {}
342341
 writeln {
343342
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
344343
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
345344
346345
 #
@@ -796,26 +795,29 @@
796795
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
797796
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
798797
 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
799798
 }
800799
800
+set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
801
+lappend MINGW_SQLITE_OPTIONS -D_HAVE_SQLITE_CONFIG_H
802
+lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
803
+lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
804
+
805
+set j " \\\n "
806
+writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
807
+set j " \\\n "
808
+writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
801809
802810
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
803
-set opt [join $SQLITE_OPTIONS { }]
804
-append opt " -D_HAVE_SQLITE_CONFIG_H"
805
-append opt " -DSQLITE_USE_MALLOC_H"
806
-append opt " -DSQLITE_USE_MSIZE"
807
-writeln "\t\$(XTCC) $opt \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
811
+writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
808812
809
-set opt {}
810813
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
811
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
814
+writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
812815
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
813816
814817
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
815
-set opt [join $SHELL_WIN32_OPTIONS { }]
816
-writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
818
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
817819
818820
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
819821
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
820822
821823
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
822824
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -217,11 +217,11 @@
217 writeln "\n"
218 writeln "APPNAME = $name\$(E)"
219 writeln "\n"
220
221 writeln [string map [list \
222 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
224 all: $(OBJDIR) $(APPNAME)
225
226 install: $(APPNAME)
227 mkdir -p $(INSTALLDIR)
@@ -336,11 +336,10 @@
336 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
337
338 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
339 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
340
341 set opt {}
342 writeln {
343 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
344 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
345
346 #
@@ -796,26 +795,29 @@
796 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
797 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
798 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
799 }
800
 
 
 
 
 
 
 
 
 
801
802 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
803 set opt [join $SQLITE_OPTIONS { }]
804 append opt " -D_HAVE_SQLITE_CONFIG_H"
805 append opt " -DSQLITE_USE_MALLOC_H"
806 append opt " -DSQLITE_USE_MSIZE"
807 writeln "\t\$(XTCC) $opt \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
808
809 set opt {}
810 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
811 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
812 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
813
814 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
815 set opt [join $SHELL_WIN32_OPTIONS { }]
816 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
817
818 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
819 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
820
821 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
822
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -217,11 +217,11 @@
217 writeln "\n"
218 writeln "APPNAME = $name\$(E)"
219 writeln "\n"
220
221 writeln [string map [list \
222 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
224 all: $(OBJDIR) $(APPNAME)
225
226 install: $(APPNAME)
227 mkdir -p $(INSTALLDIR)
@@ -336,11 +336,10 @@
336 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
337
338 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
339 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
340
 
341 writeln {
342 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
343 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
344
345 #
@@ -796,26 +795,29 @@
795 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
796 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
797 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
798 }
799
800 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
801 lappend MINGW_SQLITE_OPTIONS -D_HAVE_SQLITE_CONFIG_H
802 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
803 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
804
805 set j " \\\n "
806 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
807 set j " \\\n "
808 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
809
810 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
811 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
 
 
 
 
812
 
813 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
814 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
815 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
816
817 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
818 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
 
819
820 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
821 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
822
823 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
824
M win/Makefile.mingw
+20 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1685,21 +1685,38 @@
16851685
16861686
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
16871687
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
16881688
16891689
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
+
1691
+SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1692
+ -DSQLITE_THREADSAFE=0 \
1693
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1694
+ -DSQLITE_OMIT_DEPRECATED \
1695
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1696
+ -Dlocaltime=fossil_localtime \
1697
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1698
+ -D_HAVE_SQLITE_CONFIG_H \
1699
+ -DSQLITE_USE_MALLOC_H \
1700
+ -DSQLITE_USE_MSIZE
1701
+
1702
+SHELL_OPTIONS = -Dmain=sqlite3_shell \
1703
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1704
+ -Dsqlite3_strglob=strglob \
1705
+ -Dgetenv=fossil_getenv \
1706
+ -Dfopen=fossil_fopen
16901707
16911708
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1709
+ $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16931710
16941711
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1712
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16961713
16971714
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16981715
16991716
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1717
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
17011718
17021719
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17031720
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17041721
17051722
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17061723
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1685,21 +1685,38 @@
1685
1686 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1703 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1685,21 +1685,38 @@
1685
1686 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1692 -DSQLITE_THREADSAFE=0 \
1693 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1694 -DSQLITE_OMIT_DEPRECATED \
1695 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1696 -Dlocaltime=fossil_localtime \
1697 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1698 -D_HAVE_SQLITE_CONFIG_H \
1699 -DSQLITE_USE_MALLOC_H \
1700 -DSQLITE_USE_MSIZE
1701
1702 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1703 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1704 -Dsqlite3_strglob=strglob \
1705 -Dgetenv=fossil_getenv \
1706 -Dfopen=fossil_fopen
1707
1708 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1709 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1710
1711 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1712 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1713
1714 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1715
1716 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1717 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1718
1719 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1720 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1721
1722 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1723
M win/Makefile.mingw.mistachkin
+20 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1685,21 +1685,38 @@
16851685
16861686
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
16871687
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
16881688
16891689
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
+
1691
+SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1692
+ -DSQLITE_THREADSAFE=0 \
1693
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1694
+ -DSQLITE_OMIT_DEPRECATED \
1695
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1696
+ -Dlocaltime=fossil_localtime \
1697
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1698
+ -D_HAVE_SQLITE_CONFIG_H \
1699
+ -DSQLITE_USE_MALLOC_H \
1700
+ -DSQLITE_USE_MSIZE
1701
+
1702
+SHELL_OPTIONS = -Dmain=sqlite3_shell \
1703
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1704
+ -Dsqlite3_strglob=strglob \
1705
+ -Dgetenv=fossil_getenv \
1706
+ -Dfopen=fossil_fopen
16901707
16911708
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1709
+ $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16931710
16941711
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1712
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16961713
16971714
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16981715
16991716
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1717
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
17011718
17021719
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17031720
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17041721
17051722
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17061723
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1685,21 +1685,38 @@
1685
1686 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1698
1699 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1700 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1701
1702 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1703 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1704
1705 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1706
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1685,21 +1685,38 @@
1685
1686 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1692 -DSQLITE_THREADSAFE=0 \
1693 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1694 -DSQLITE_OMIT_DEPRECATED \
1695 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1696 -Dlocaltime=fossil_localtime \
1697 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1698 -D_HAVE_SQLITE_CONFIG_H \
1699 -DSQLITE_USE_MALLOC_H \
1700 -DSQLITE_USE_MSIZE
1701
1702 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1703 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1704 -Dsqlite3_strglob=strglob \
1705 -Dgetenv=fossil_getenv \
1706 -Dfopen=fossil_fopen
1707
1708 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1709 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1710
1711 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1712 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1713
1714 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1715
1716 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1717 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1718
1719 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1720 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1721
1722 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1723

Keyboard Shortcuts

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