Fossil SCM
Fix Win64 build with MinGW. Problem reported by Martin Gagnon.
Commit
0d70a87234abde3a781cc3beda767e17f274f304
Parent
6e55cfe61c3556d…
5 files changed
+4
-4
+4
-4
+3
-2
+3
-3
+3
-3
+4
-4
| --- src/config.h | ||
| +++ src/config.h | ||
| @@ -25,13 +25,13 @@ | ||
| 25 | 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | 27 | #endif |
| 28 | 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | 29 | |
| 30 | -/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */ | |
| 31 | -#ifdef _WIN64 | |
| 32 | -# undef _USE_32BIT_TIME_T | |
| 30 | +/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */ | |
| 31 | +#if defined(_WIN32) && !defined(_WIN64) | |
| 32 | +# define _USE_32BIT_TIME_T | |
| 33 | 33 | #endif |
| 34 | 34 | |
| 35 | 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | 36 | #include "autoconfig.h" |
| 37 | 37 | #endif |
| @@ -87,11 +87,11 @@ | ||
| 87 | 87 | # else |
| 88 | 88 | # define COMPILER_NAME "unknown" |
| 89 | 89 | # endif |
| 90 | 90 | #endif |
| 91 | 91 | |
| 92 | -#ifndef _RC_COMPILE_ | |
| 92 | +#if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION) | |
| 93 | 93 | |
| 94 | 94 | #include "sqlite3.h" |
| 95 | 95 | |
| 96 | 96 | /* |
| 97 | 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 | 98 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -25,13 +25,13 @@ | |
| 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | #endif |
| 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | |
| 30 | /* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */ |
| 31 | #ifdef _WIN64 |
| 32 | # undef _USE_32BIT_TIME_T |
| 33 | #endif |
| 34 | |
| 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | #include "autoconfig.h" |
| 37 | #endif |
| @@ -87,11 +87,11 @@ | |
| 87 | # else |
| 88 | # define COMPILER_NAME "unknown" |
| 89 | # endif |
| 90 | #endif |
| 91 | |
| 92 | #ifndef _RC_COMPILE_ |
| 93 | |
| 94 | #include "sqlite3.h" |
| 95 | |
| 96 | /* |
| 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -25,13 +25,13 @@ | |
| 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | #endif |
| 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | |
| 30 | /* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */ |
| 31 | #if defined(_WIN32) && !defined(_WIN64) |
| 32 | # define _USE_32BIT_TIME_T |
| 33 | #endif |
| 34 | |
| 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | #include "autoconfig.h" |
| 37 | #endif |
| @@ -87,11 +87,11 @@ | |
| 87 | # else |
| 88 | # define COMPILER_NAME "unknown" |
| 89 | # endif |
| 90 | #endif |
| 91 | |
| 92 | #if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION) |
| 93 | |
| 94 | #include "sqlite3.h" |
| 95 | |
| 96 | /* |
| 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 |
+4
-4
| --- src/config.h | ||
| +++ src/config.h | ||
| @@ -25,13 +25,13 @@ | ||
| 25 | 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | 27 | #endif |
| 28 | 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | 29 | |
| 30 | -/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */ | |
| 31 | -#ifdef _WIN64 | |
| 32 | -# undef _USE_32BIT_TIME_T | |
| 30 | +/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */ | |
| 31 | +#if defined(_WIN32) && !defined(_WIN64) | |
| 32 | +# define _USE_32BIT_TIME_T | |
| 33 | 33 | #endif |
| 34 | 34 | |
| 35 | 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | 36 | #include "autoconfig.h" |
| 37 | 37 | #endif |
| @@ -87,11 +87,11 @@ | ||
| 87 | 87 | # else |
| 88 | 88 | # define COMPILER_NAME "unknown" |
| 89 | 89 | # endif |
| 90 | 90 | #endif |
| 91 | 91 | |
| 92 | -#ifndef _RC_COMPILE_ | |
| 92 | +#if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION) | |
| 93 | 93 | |
| 94 | 94 | #include "sqlite3.h" |
| 95 | 95 | |
| 96 | 96 | /* |
| 97 | 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 | 98 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -25,13 +25,13 @@ | |
| 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | #endif |
| 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | |
| 30 | /* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */ |
| 31 | #ifdef _WIN64 |
| 32 | # undef _USE_32BIT_TIME_T |
| 33 | #endif |
| 34 | |
| 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | #include "autoconfig.h" |
| 37 | #endif |
| @@ -87,11 +87,11 @@ | |
| 87 | # else |
| 88 | # define COMPILER_NAME "unknown" |
| 89 | # endif |
| 90 | #endif |
| 91 | |
| 92 | #ifndef _RC_COMPILE_ |
| 93 | |
| 94 | #include "sqlite3.h" |
| 95 | |
| 96 | /* |
| 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -25,13 +25,13 @@ | |
| 25 | #ifndef _FILE_OFFSET_BITS |
| 26 | # define _FILE_OFFSET_BITS 64 |
| 27 | #endif |
| 28 | #define _LARGEFILE_SOURCE 1 |
| 29 | |
| 30 | /* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */ |
| 31 | #if defined(_WIN32) && !defined(_WIN64) |
| 32 | # define _USE_32BIT_TIME_T |
| 33 | #endif |
| 34 | |
| 35 | #ifdef HAVE_AUTOCONFIG_H |
| 36 | #include "autoconfig.h" |
| 37 | #endif |
| @@ -87,11 +87,11 @@ | |
| 87 | # else |
| 88 | # define COMPILER_NAME "unknown" |
| 89 | # endif |
| 90 | #endif |
| 91 | |
| 92 | #if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION) |
| 93 | |
| 94 | #include "sqlite3.h" |
| 95 | |
| 96 | /* |
| 97 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 98 |
+3
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -502,12 +502,12 @@ | ||
| 502 | 502 | endif |
| 503 | 503 | endif |
| 504 | 504 | |
| 505 | 505 | # With MinGW command line handling workaround |
| 506 | 506 | ifdef MINGW_IS_32BIT_ONLY |
| 507 | -TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 508 | -RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 507 | +TCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 508 | +RCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 509 | 509 | endif |
| 510 | 510 | |
| 511 | 511 | # With HTTPS support |
| 512 | 512 | ifdef FOSSIL_ENABLE_SSL |
| 513 | 513 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -771,10 +771,11 @@ | ||
| 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" | |
| 776 | 777 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 777 | 778 | |
| 778 | 779 | set opt {} |
| 779 | 780 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 780 | 781 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| 781 | 782 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -502,12 +502,12 @@ | |
| 502 | endif |
| 503 | endif |
| 504 | |
| 505 | # With MinGW command line handling workaround |
| 506 | ifdef MINGW_IS_32BIT_ONLY |
| 507 | TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 508 | RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 509 | endif |
| 510 | |
| 511 | # With HTTPS support |
| 512 | ifdef FOSSIL_ENABLE_SSL |
| 513 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -771,10 +771,11 @@ | |
| 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" |
| 781 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -502,12 +502,12 @@ | |
| 502 | endif |
| 503 | endif |
| 504 | |
| 505 | # With MinGW command line handling workaround |
| 506 | ifdef MINGW_IS_32BIT_ONLY |
| 507 | TCC += -DBROKEN_MINGW_CMDLINE=1 |
| 508 | RCC += -DBROKEN_MINGW_CMDLINE=1 |
| 509 | endif |
| 510 | |
| 511 | # With HTTPS support |
| 512 | ifdef FOSSIL_ENABLE_SSL |
| 513 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -771,10 +771,11 @@ | |
| 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 |
+3
-3
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -163,12 +163,12 @@ | ||
| 163 | 163 | endif |
| 164 | 164 | endif |
| 165 | 165 | |
| 166 | 166 | # With MinGW command line handling workaround |
| 167 | 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | -TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 169 | -RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 168 | +TCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 169 | +RCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 170 | 170 | endif |
| 171 | 171 | |
| 172 | 172 | # With HTTPS support |
| 173 | 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | ||
| 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 -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 -D_HAVE_SQLITE_CONFIG_H -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 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -163,12 +163,12 @@ | |
| 163 | endif |
| 164 | endif |
| 165 | |
| 166 | # With MinGW command line handling workaround |
| 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 169 | RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 170 | endif |
| 171 | |
| 172 | # With HTTPS support |
| 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | |
| 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 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -163,12 +163,12 @@ | |
| 163 | endif |
| 164 | endif |
| 165 | |
| 166 | # With MinGW command line handling workaround |
| 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | TCC += -DBROKEN_MINGW_CMDLINE=1 |
| 169 | RCC += -DBROKEN_MINGW_CMDLINE=1 |
| 170 | endif |
| 171 | |
| 172 | # With HTTPS support |
| 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | |
| 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 |
+3
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -163,12 +163,12 @@ | ||
| 163 | 163 | endif |
| 164 | 164 | endif |
| 165 | 165 | |
| 166 | 166 | # With MinGW command line handling workaround |
| 167 | 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | -TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 169 | -RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T | |
| 168 | +TCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 169 | +RCC += -DBROKEN_MINGW_CMDLINE=1 | |
| 170 | 170 | endif |
| 171 | 171 | |
| 172 | 172 | # With HTTPS support |
| 173 | 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | ||
| 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 -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 -D_HAVE_SQLITE_CONFIG_H -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 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -163,12 +163,12 @@ | |
| 163 | endif |
| 164 | endif |
| 165 | |
| 166 | # With MinGW command line handling workaround |
| 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 169 | RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T |
| 170 | endif |
| 171 | |
| 172 | # With HTTPS support |
| 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | |
| 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 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -163,12 +163,12 @@ | |
| 163 | endif |
| 164 | endif |
| 165 | |
| 166 | # With MinGW command line handling workaround |
| 167 | ifdef MINGW_IS_32BIT_ONLY |
| 168 | TCC += -DBROKEN_MINGW_CMDLINE=1 |
| 169 | RCC += -DBROKEN_MINGW_CMDLINE=1 |
| 170 | endif |
| 171 | |
| 172 | # With HTTPS support |
| 173 | ifdef FOSSIL_ENABLE_SSL |
| 174 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| @@ -1685,11 +1685,11 @@ | |
| 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 |