Fossil SCM

Compilation 'portability' enhancements for MinGW.

mistachkin 2016-05-27 22:25 trunk
Commit 1bb6f3d34c429670df7f3770b2bfa0c25dc7872f
Parent 67cdb9b186ee858…
5 files changed +6 -3 +3 +1 +6 -4 +5 -3
~ src/makemake.tcl ~ src/user.c ~ src/winhttp.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+6 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -338,12 +338,12 @@
338338
339339
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
340340
 # to 1. If it is set to 1, then there is no need to build or link
341341
 # the sqlite3.o object. Instead, the system SQLite will be linked
342342
 # using -lsqlite3.
343
-SQLITE3_OBJ.1 =
344343
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
344
+SQLITE3_OBJ.1 =
345345
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
346346
347347
 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
348348
 # set to 1. If it is set to 1, the miniz library included in the
349349
 # source tree should be used; otherwise, it should not.
@@ -1012,12 +1012,12 @@
10121012
10131013
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
10141014
 # to 1. If it is set to 1, then there is no need to build or link
10151015
 # the sqlite3.o object. Instead, the system SQLite will be linked
10161016
 # using -lsqlite3.
1017
-SQLITE3_OBJ.1 =
10181017
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1018
+SQLITE3_OBJ.1 =
10191019
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
10201020
10211021
 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
10221022
 # set to 1. If it is set to 1, the miniz library included in the
10231023
 # source tree should be used; otherwise, it should not.
@@ -1142,16 +1142,19 @@
11421142
 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
11431143
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
11441144
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
11451145
 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
11461146
 }
1147
+
1148
+writeln {MINGW_OPTIONS = -D_HAVE__MINGW_H
1149
+}
11471150
11481151
 set SQLITE_WIN32_OPTIONS $SQLITE_OPTIONS
11491152
 lappend SQLITE_WIN32_OPTIONS -DSQLITE_WIN32_NO_ANSI
11501153
11511154
 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
1152
-lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
1155
+lappend MINGW_SQLITE_OPTIONS {$(MINGW_OPTIONS)}
11531156
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
11541157
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
11551158
11561159
 set MINIZ_WIN32_OPTIONS $MINIZ_OPTIONS
11571160
11581161
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -338,12 +338,12 @@
338
339 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
340 # to 1. If it is set to 1, then there is no need to build or link
341 # the sqlite3.o object. Instead, the system SQLite will be linked
342 # using -lsqlite3.
343 SQLITE3_OBJ.1 =
344 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
 
345 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
346
347 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
348 # set to 1. If it is set to 1, the miniz library included in the
349 # source tree should be used; otherwise, it should not.
@@ -1012,12 +1012,12 @@
1012
1013 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1014 # to 1. If it is set to 1, then there is no need to build or link
1015 # the sqlite3.o object. Instead, the system SQLite will be linked
1016 # using -lsqlite3.
1017 SQLITE3_OBJ.1 =
1018 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
 
1019 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1020
1021 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
1022 # set to 1. If it is set to 1, the miniz library included in the
1023 # source tree should be used; otherwise, it should not.
@@ -1142,16 +1142,19 @@
1142 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1143 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
1144 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
1145 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
1146 }
 
 
 
1147
1148 set SQLITE_WIN32_OPTIONS $SQLITE_OPTIONS
1149 lappend SQLITE_WIN32_OPTIONS -DSQLITE_WIN32_NO_ANSI
1150
1151 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
1152 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
1153 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
1154 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
1155
1156 set MINIZ_WIN32_OPTIONS $MINIZ_OPTIONS
1157
1158
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -338,12 +338,12 @@
338
339 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
340 # to 1. If it is set to 1, then there is no need to build or link
341 # the sqlite3.o object. Instead, the system SQLite will be linked
342 # using -lsqlite3.
 
343 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
344 SQLITE3_OBJ.1 =
345 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
346
347 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
348 # set to 1. If it is set to 1, the miniz library included in the
349 # source tree should be used; otherwise, it should not.
@@ -1012,12 +1012,12 @@
1012
1013 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1014 # to 1. If it is set to 1, then there is no need to build or link
1015 # the sqlite3.o object. Instead, the system SQLite will be linked
1016 # using -lsqlite3.
 
1017 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1018 SQLITE3_OBJ.1 =
1019 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1020
1021 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
1022 # set to 1. If it is set to 1, the miniz library included in the
1023 # source tree should be used; otherwise, it should not.
@@ -1142,16 +1142,19 @@
1142 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1143 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
1144 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
1145 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
1146 }
1147
1148 writeln {MINGW_OPTIONS = -D_HAVE__MINGW_H
1149 }
1150
1151 set SQLITE_WIN32_OPTIONS $SQLITE_OPTIONS
1152 lappend SQLITE_WIN32_OPTIONS -DSQLITE_WIN32_NO_ANSI
1153
1154 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
1155 lappend MINGW_SQLITE_OPTIONS {$(MINGW_OPTIONS)}
1156 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
1157 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
1158
1159 set MINIZ_WIN32_OPTIONS $MINIZ_OPTIONS
1160
1161
M src/user.c
+3
--- src/user.c
+++ src/user.c
@@ -19,10 +19,13 @@
1919
 ** querying information about users.
2020
 */
2121
 #include "config.h"
2222
 #include "user.h"
2323
24
+#if defined(_WIN32)
25
+#include <conio.h>
26
+#endif
2427
2528
 /*
2629
 ** Strip leading and trailing space from a string and add the string
2730
 ** onto the end of a blob.
2831
 */
2932
--- src/user.c
+++ src/user.c
@@ -19,10 +19,13 @@
19 ** querying information about users.
20 */
21 #include "config.h"
22 #include "user.h"
23
 
 
 
24
25 /*
26 ** Strip leading and trailing space from a string and add the string
27 ** onto the end of a blob.
28 */
29
--- src/user.c
+++ src/user.c
@@ -19,10 +19,13 @@
19 ** querying information about users.
20 */
21 #include "config.h"
22 #include "user.h"
23
24 #if defined(_WIN32)
25 #include <conio.h>
26 #endif
27
28 /*
29 ** Strip leading and trailing space from a string and add the string
30 ** onto the end of a blob.
31 */
32
M src/winhttp.c
+1
--- src/winhttp.c
+++ src/winhttp.c
@@ -21,10 +21,11 @@
2121
 */
2222
 #include "config.h"
2323
 #ifdef _WIN32
2424
 /* This code is for win32 only */
2525
 #include <windows.h>
26
+#include <process.h>
2627
 #include "winhttp.h"
2728
2829
 /*
2930
 ** The HttpRequest structure holds information about each incoming
3031
 ** HTTP request.
3132
--- src/winhttp.c
+++ src/winhttp.c
@@ -21,10 +21,11 @@
21 */
22 #include "config.h"
23 #ifdef _WIN32
24 /* This code is for win32 only */
25 #include <windows.h>
 
26 #include "winhttp.h"
27
28 /*
29 ** The HttpRequest structure holds information about each incoming
30 ** HTTP request.
31
--- src/winhttp.c
+++ src/winhttp.c
@@ -21,10 +21,11 @@
21 */
22 #include "config.h"
23 #ifdef _WIN32
24 /* This code is for win32 only */
25 #include <windows.h>
26 #include <process.h>
27 #include "winhttp.h"
28
29 /*
30 ** The HttpRequest structure holds information about each incoming
31 ** HTTP request.
32
M win/Makefile.mingw
+6 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -921,12 +921,12 @@
921921
922922
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923923
 # to 1. If it is set to 1, then there is no need to build or link
924924
 # the sqlite3.o object. Instead, the system SQLite will be linked
925925
 # using -lsqlite3.
926
-SQLITE3_OBJ.1 =
927926
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
927
+SQLITE3_OBJ.1 =
928928
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929929
930930
 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931931
 # set to 1. If it is set to 1, the miniz library included in the
932932
 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936936
937937
 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938938
 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939939
 # the source tree) is used and extra flags are provided to enable
940940
 # the SQLite Encryption Extension.
941
-SQLITE3_SRC.1 = sqlite3-see.c
942941
 SQLITE3_SRC.0 = sqlite3.c
942
+SQLITE3_SRC.1 = sqlite3-see.c
943943
 SQLITE3_SRC. = sqlite3.c
944944
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
945
-SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
946945
 SEE_FLAGS.0 =
946
+SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
947947
 SEE_FLAGS. =
948948
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949949
950950
951951
 EXTRAOBJ = \
@@ -2105,10 +2105,12 @@
21052105
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
21062106
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
21072107
21082108
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
21092109
2110
+MINGW_OPTIONS = -D_HAVE__MINGW_H
2111
+
21102112
 SQLITE_OPTIONS = -DNDEBUG=1 \
21112113
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
21122114
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
21132115
 -DSQLITE_THREADSAFE=0 \
21142116
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -2118,11 +2120,11 @@
21182120
 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
21192121
 -DSQLITE_ENABLE_DBSTAT_VTAB \
21202122
 -DSQLITE_ENABLE_JSON1 \
21212123
 -DSQLITE_ENABLE_FTS5 \
21222124
 -DSQLITE_WIN32_NO_ANSI \
2123
- -D_HAVE__MINGW_H \
2125
+ $(MINGW_OPTIONS) \
21242126
 -DSQLITE_USE_MALLOC_H \
21252127
 -DSQLITE_USE_MSIZE
21262128
21272129
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
21282130
 -DSQLITE_SHELL_IS_UTF8=1 \
21292131
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -921,12 +921,12 @@
921
922 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923 # to 1. If it is set to 1, then there is no need to build or link
924 # the sqlite3.o object. Instead, the system SQLite will be linked
925 # using -lsqlite3.
926 SQLITE3_OBJ.1 =
927 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
 
928 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929
930 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931 # set to 1. If it is set to 1, the miniz library included in the
932 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936
937 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939 # the source tree) is used and extra flags are provided to enable
940 # the SQLite Encryption Extension.
941 SQLITE3_SRC.1 = sqlite3-see.c
942 SQLITE3_SRC.0 = sqlite3.c
 
943 SQLITE3_SRC. = sqlite3.c
944 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
945 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
946 SEE_FLAGS.0 =
 
947 SEE_FLAGS. =
948 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949
950
951 EXTRAOBJ = \
@@ -2105,10 +2105,12 @@
2105 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2106 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2107
2108 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2109
 
 
2110 SQLITE_OPTIONS = -DNDEBUG=1 \
2111 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2112 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2113 -DSQLITE_THREADSAFE=0 \
2114 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -2118,11 +2120,11 @@
2118 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2119 -DSQLITE_ENABLE_DBSTAT_VTAB \
2120 -DSQLITE_ENABLE_JSON1 \
2121 -DSQLITE_ENABLE_FTS5 \
2122 -DSQLITE_WIN32_NO_ANSI \
2123 -D_HAVE__MINGW_H \
2124 -DSQLITE_USE_MALLOC_H \
2125 -DSQLITE_USE_MSIZE
2126
2127 SHELL_OPTIONS = -Dmain=sqlite3_shell \
2128 -DSQLITE_SHELL_IS_UTF8=1 \
2129
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -921,12 +921,12 @@
921
922 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923 # to 1. If it is set to 1, then there is no need to build or link
924 # the sqlite3.o object. Instead, the system SQLite will be linked
925 # using -lsqlite3.
 
926 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
927 SQLITE3_OBJ.1 =
928 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929
930 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931 # set to 1. If it is set to 1, the miniz library included in the
932 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936
937 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939 # the source tree) is used and extra flags are provided to enable
940 # the SQLite Encryption Extension.
 
941 SQLITE3_SRC.0 = sqlite3.c
942 SQLITE3_SRC.1 = sqlite3-see.c
943 SQLITE3_SRC. = sqlite3.c
944 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
945 SEE_FLAGS.0 =
946 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
947 SEE_FLAGS. =
948 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949
950
951 EXTRAOBJ = \
@@ -2105,10 +2105,12 @@
2105 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2106 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2107
2108 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2109
2110 MINGW_OPTIONS = -D_HAVE__MINGW_H
2111
2112 SQLITE_OPTIONS = -DNDEBUG=1 \
2113 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2114 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2115 -DSQLITE_THREADSAFE=0 \
2116 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -2118,11 +2120,11 @@
2120 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2121 -DSQLITE_ENABLE_DBSTAT_VTAB \
2122 -DSQLITE_ENABLE_JSON1 \
2123 -DSQLITE_ENABLE_FTS5 \
2124 -DSQLITE_WIN32_NO_ANSI \
2125 $(MINGW_OPTIONS) \
2126 -DSQLITE_USE_MALLOC_H \
2127 -DSQLITE_USE_MSIZE
2128
2129 SHELL_OPTIONS = -Dmain=sqlite3_shell \
2130 -DSQLITE_SHELL_IS_UTF8=1 \
2131
M win/Makefile.mingw.mistachkin
+5 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -921,12 +921,12 @@
921921
922922
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923923
 # to 1. If it is set to 1, then there is no need to build or link
924924
 # the sqlite3.o object. Instead, the system SQLite will be linked
925925
 # using -lsqlite3.
926
-SQLITE3_OBJ.1 =
927926
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
927
+SQLITE3_OBJ.1 =
928928
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929929
930930
 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931931
 # set to 1. If it is set to 1, the miniz library included in the
932932
 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936936
937937
 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938938
 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939939
 # the source tree) is used and extra flags are provided to enable
940940
 # the SQLite Encryption Extension.
941
-SQLITE3_SRC.1 = sqlite3-see.c
942941
 SQLITE3_SRC.0 = sqlite3.c
942
+SQLITE3_SRC.1 = sqlite3-see.c
943943
 SQLITE3_SRC. = sqlite3.c
944944
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
945
-SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
946945
 SEE_FLAGS.0 =
946
+SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
947947
 SEE_FLAGS. =
948948
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949949
950950
951951
 EXTRAOBJ = \
@@ -2104,10 +2104,12 @@
21042104
21052105
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
21062106
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
21072107
21082108
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2109
+
2110
+MINGW_OPTIONS = -D_HAVE__MINGW_H
21092111
21102112
 SQLITE_OPTIONS = -DNDEBUG=1 \
21112113
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
21122114
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
21132115
 -DSQLITE_THREADSAFE=0 \
21142116
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -921,12 +921,12 @@
921
922 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923 # to 1. If it is set to 1, then there is no need to build or link
924 # the sqlite3.o object. Instead, the system SQLite will be linked
925 # using -lsqlite3.
926 SQLITE3_OBJ.1 =
927 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
 
928 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929
930 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931 # set to 1. If it is set to 1, the miniz library included in the
932 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936
937 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939 # the source tree) is used and extra flags are provided to enable
940 # the SQLite Encryption Extension.
941 SQLITE3_SRC.1 = sqlite3-see.c
942 SQLITE3_SRC.0 = sqlite3.c
 
943 SQLITE3_SRC. = sqlite3.c
944 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
945 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
946 SEE_FLAGS.0 =
 
947 SEE_FLAGS. =
948 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949
950
951 EXTRAOBJ = \
@@ -2104,10 +2104,12 @@
2104
2105 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2106 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2107
2108 $(OBJDIR)/zip.h: $(OBJDIR)/headers
 
 
2109
2110 SQLITE_OPTIONS = -DNDEBUG=1 \
2111 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2112 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2113 -DSQLITE_THREADSAFE=0 \
2114
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -921,12 +921,12 @@
921
922 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
923 # to 1. If it is set to 1, then there is no need to build or link
924 # the sqlite3.o object. Instead, the system SQLite will be linked
925 # using -lsqlite3.
 
926 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
927 SQLITE3_OBJ.1 =
928 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
929
930 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
931 # set to 1. If it is set to 1, the miniz library included in the
932 # source tree should be used; otherwise, it should not.
@@ -936,16 +936,16 @@
936
937 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
938 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
939 # the source tree) is used and extra flags are provided to enable
940 # the SQLite Encryption Extension.
 
941 SQLITE3_SRC.0 = sqlite3.c
942 SQLITE3_SRC.1 = sqlite3-see.c
943 SQLITE3_SRC. = sqlite3.c
944 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
945 SEE_FLAGS.0 =
946 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
947 SEE_FLAGS. =
948 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
949
950
951 EXTRAOBJ = \
@@ -2104,10 +2104,12 @@
2104
2105 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2106 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2107
2108 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2109
2110 MINGW_OPTIONS = -D_HAVE__MINGW_H
2111
2112 SQLITE_OPTIONS = -DNDEBUG=1 \
2113 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2114 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2115 -DSQLITE_THREADSAFE=0 \
2116

Keyboard Shortcuts

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