Fossil SCM
Revert makefile changes in previous commit: It broke the normal MinGW build! Sorry!
Commit
6e55cfe61c3556dc913adf3b3edb53f3ed4f08ce
Parent
2530ee0372db065…
4 files changed
-2
+2
-2
+2
-2
-2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -771,11 +771,10 @@ | ||
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | |
| 774 | 774 | writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c" |
| 775 | 775 | set opt $SQLITE_OPTIONS |
| 776 | -append opt " -D_HAVE_SQLITE_CONFIG_H" | |
| 777 | 776 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 778 | 777 | |
| 779 | 778 | set opt {} |
| 780 | 779 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 781 | 780 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| @@ -782,11 +781,10 @@ | ||
| 782 | 781 | 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" |
| 783 | 782 | |
| 784 | 783 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 785 | 784 | set opt {-Dmain=sqlite3_shell} |
| 786 | 785 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 787 | -append opt " -D_HAVE_SQLITE_CONFIG_H" | |
| 788 | 786 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 789 | 787 | |
| 790 | 788 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 791 | 789 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 792 | 790 | |
| 793 | 791 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -771,11 +771,10 @@ | |
| 771 | } |
| 772 | |
| 773 | |
| 774 | writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c" |
| 775 | set opt $SQLITE_OPTIONS |
| 776 | append opt " -D_HAVE_SQLITE_CONFIG_H" |
| 777 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 778 | |
| 779 | set opt {} |
| 780 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 781 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| @@ -782,11 +781,10 @@ | |
| 782 | 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" |
| 783 | |
| 784 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 785 | set opt {-Dmain=sqlite3_shell} |
| 786 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 787 | append opt " -D_HAVE_SQLITE_CONFIG_H" |
| 788 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 789 | |
| 790 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 791 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 792 | |
| 793 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -771,11 +771,10 @@ | |
| 771 | } |
| 772 | |
| 773 | |
| 774 | writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c" |
| 775 | set opt $SQLITE_OPTIONS |
| 776 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 777 | |
| 778 | set opt {} |
| 779 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 780 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| @@ -782,11 +781,10 @@ | |
| 781 | 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" |
| 782 | |
| 783 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 784 | set opt {-Dmain=sqlite3_shell} |
| 785 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 786 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 787 | |
| 788 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 789 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 790 | |
| 791 |
+2
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -1685,19 +1685,19 @@ | ||
| 1685 | 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | 1686 | |
| 1687 | 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | 1688 | |
| 1689 | 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | - $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1690 | + $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1691 | 1691 | |
| 1692 | 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | 1694 | |
| 1695 | 1695 | $(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 |
| 1696 | 1696 | |
| 1697 | 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | - $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 1698 | + $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 1699 | 1699 | |
| 1700 | 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | 1702 | |
| 1703 | 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 | 1704 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1685,19 +1685,19 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(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 |
| 1696 | |
| 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1699 | |
| 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | |
| 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1685,19 +1685,19 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(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 |
| 1696 | |
| 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1699 | |
| 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | |
| 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 |
+2
-2
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1685,19 +1685,19 @@ | ||
| 1685 | 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | 1686 | |
| 1687 | 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | 1688 | |
| 1689 | 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | - $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1690 | + $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o | |
| 1691 | 1691 | |
| 1692 | 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | 1694 | |
| 1695 | 1695 | $(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 |
| 1696 | 1696 | |
| 1697 | 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | - $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 1698 | + $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 1699 | 1699 | |
| 1700 | 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | 1702 | |
| 1703 | 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 | 1704 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1685,19 +1685,19 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(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 |
| 1696 | |
| 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1699 | |
| 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | |
| 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1685,19 +1685,19 @@ | |
| 1685 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1686 | |
| 1687 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1688 | |
| 1689 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1690 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1691 | |
| 1692 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1693 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1694 | |
| 1695 | $(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 |
| 1696 | |
| 1697 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1698 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1699 | |
| 1700 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1701 | $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1702 | |
| 1703 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1704 |
-2
| --- win/fossil.rc | ||
| +++ win/fossil.rc | ||
| @@ -16,12 +16,10 @@ | ||
| 16 | 16 | ******************************************************************************* |
| 17 | 17 | ** |
| 18 | 18 | ** This file contains resource information for the executable on Windows. |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | -#undef _USE_32BIT_TIME_T | |
| 22 | - | |
| 23 | 21 | #if !defined(_WIN32_WCE) |
| 24 | 22 | #include "winresrc.h" |
| 25 | 23 | #else |
| 26 | 24 | #include "windows.h" |
| 27 | 25 | #endif /* !defined(_WIN32_WCE) */ |
| 28 | 26 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -16,12 +16,10 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file contains resource information for the executable on Windows. |
| 19 | */ |
| 20 | |
| 21 | #undef _USE_32BIT_TIME_T |
| 22 | |
| 23 | #if !defined(_WIN32_WCE) |
| 24 | #include "winresrc.h" |
| 25 | #else |
| 26 | #include "windows.h" |
| 27 | #endif /* !defined(_WIN32_WCE) */ |
| 28 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -16,12 +16,10 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file contains resource information for the executable on Windows. |
| 19 | */ |
| 20 | |
| 21 | #if !defined(_WIN32_WCE) |
| 22 | #include "winresrc.h" |
| 23 | #else |
| 24 | #include "windows.h" |
| 25 | #endif /* !defined(_WIN32_WCE) */ |
| 26 |