Fossil SCM

For the MinGW makefiles, support optional prefixing of all linker arguments.

mistachkin 2016-05-27 23:07 UTC trunk

Commit 0ac4f5d33b6c52758c5b0159124d14bb5e3c5f54

Parent de609c7cac37d95…

3 files changed +22 -15 +22 -15 +23 -16

~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin

M src/makemake.tcl

+22 -15

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -687,17 +687,22 @@
687	687
688	688	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
689	689	#
690	690	ifdef FOSSIL_ENABLE_TCL_STUBS
691	691	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
692		-LIBTCL = -ltclstub86
	692	+LIBTCL = $(XLDARG) -ltclstub86
693	693	endif
694	694	TCLTARGET = libtclstub86.a
695	695	else
696		-LIBTCL = -ltcl86
	696	+LIBTCL = $(XLDARG) -ltcl86
697	697	TCLTARGET = binaries
698	698	endif
	699	+
	700	+#### The prefix for all arguments that should be passed to the linker.
	701	+# GCC does not need this; however, other compilers may.
	702	+#
	703	+XLDARG =
699	704
700	705	#### C compiler for use in building executables that will run on the
701	706	# target platform. This is usually the same as BCCEXE, unless you
702	707	# are cross-compiling. This C compiler builds the finished binary
703	708	# for fossil. See BCC and BCCEXE above for the C compiler for
		@@ -723,11 +728,11 @@
723	728	endif
724	729
725	730	#### When not using the miniz compression library, zlib is required.
726	731	#
727	732	ifndef FOSSIL_ENABLE_MINIZ
728		-TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
	733	+TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
729	734	endif
730	735
731	736	#### Compile resources for use in building executables that will run
732	737	# on the target platform.
733	738	#
		@@ -737,21 +742,21 @@
737	742	RCC += -I$(ZINCDIR)
738	743	endif
739	744
740	745	# With HTTPS support
741	746	ifdef FOSSIL_ENABLE_SSL
742		-TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	747	+TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
743	748	RCC += -I$(OPENSSLINCDIR)
744	749	endif
745	750
746	751	# With Tcl support
747	752	ifdef FOSSIL_ENABLE_TCL
748	753	ifdef FOSSIL_TCL_SOURCE
749		-TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	754	+TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
750	755	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
751	756	else
752		-TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	757	+TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
753	758	RCC += -I$(TCLINCDIR)
754	759	endif
755	760	endif
756	761
757	762	# With miniz (i.e. instead of zlib)
		@@ -842,17 +847,17 @@
842	847	endif
843	848
844	849	#### SQLite: If enabled, use the system SQLite library.
845	850	#
846	851	ifdef USE_SYSTEM_SQLITE
847		-LIB += -lsqlite3
	852	+LIB += $(XLDARG) -lsqlite3
848	853	endif
849	854
850	855	#### OpenSSL: Add the necessary libraries required, if enabled.
851	856	#
852	857	ifdef FOSSIL_ENABLE_SSL
853		-LIB += -lssl -lcrypto -lgdi32
	858	+LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
854	859	endif
855	860
856	861	#### Tcl: Add the necessary libraries required, if enabled.
857	862	#
858	863	ifdef FOSSIL_ENABLE_TCL
		@@ -861,29 +866,31 @@
861	866
862	867	#### Extra arguments for linking the finished binary. Fossil needs
863	868	# to link against the Z-Lib compression library. There are no
864	869	# other mandatory dependencies.
865	870	#
866		-LIB += -lmingwex
	871	+LIB += $(XLDARG) -lmingwex
867	872
868	873	#### When not using the miniz compression library, zlib is required.
869	874	#
870	875	ifndef FOSSIL_ENABLE_MINIZ
871		-LIB += -lz
	876	+LIB += $(XLDARG) -lz
872	877	endif
873	878
874	879	#### These libraries MUST appear in the same order as they do for Tcl
875	880	# or linking with it will not work (exact reason unknown).
876	881	#
877	882	ifdef FOSSIL_ENABLE_TCL
878	883	ifdef FOSSIL_ENABLE_TCL_STUBS
879		-LIB += -lkernel32 -lws2_32
	884	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
880	885	else
881		-LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	886	+LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
	887	+LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
	888	+LIB += $(XLDARG) -lws2_32
882	889	endif
883	890	else
884		-LIB += -lkernel32 -lws2_32
	891	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
885	892	endif
886	893
887	894	#### Tcl shell for use in running the fossil test suite. This is only
888	895	# used for testing.
889	896	#
		@@ -1066,14 +1073,14 @@
1066	1073	$(OBJDIR)/cson_amalgamation.o
1067	1074	}]
1068	1075
1069	1076	writeln {
1070	1077	zlib:
1071		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
	1078	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1072	1079
1073	1080	clean-zlib:
1074		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
	1081	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1075	1082
1076	1083	$(ZLIBDIR)/inffas86.o:
1077	1084	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1078	1085
1079	1086	$(ZLIBDIR)/match.o:
1080	1087

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -687,17 +687,22 @@
687
688	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
689	#
690	ifdef FOSSIL_ENABLE_TCL_STUBS
691	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
692	LIBTCL = -ltclstub86
693	endif
694	TCLTARGET = libtclstub86.a
695	else
696	LIBTCL = -ltcl86
697	TCLTARGET = binaries
698	endif





699
700	#### C compiler for use in building executables that will run on the
701	# target platform. This is usually the same as BCCEXE, unless you
702	# are cross-compiling. This C compiler builds the finished binary
703	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -723,11 +728,11 @@
723	endif
724
725	#### When not using the miniz compression library, zlib is required.
726	#
727	ifndef FOSSIL_ENABLE_MINIZ
728	TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
729	endif
730
731	#### Compile resources for use in building executables that will run
732	# on the target platform.
733	#
	@@ -737,21 +742,21 @@
737	RCC += -I$(ZINCDIR)
738	endif
739
740	# With HTTPS support
741	ifdef FOSSIL_ENABLE_SSL
742	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
743	RCC += -I$(OPENSSLINCDIR)
744	endif
745
746	# With Tcl support
747	ifdef FOSSIL_ENABLE_TCL
748	ifdef FOSSIL_TCL_SOURCE
749	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
750	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
751	else
752	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
753	RCC += -I$(TCLINCDIR)
754	endif
755	endif
756
757	# With miniz (i.e. instead of zlib)
	@@ -842,17 +847,17 @@
842	endif
843
844	#### SQLite: If enabled, use the system SQLite library.
845	#
846	ifdef USE_SYSTEM_SQLITE
847	LIB += -lsqlite3
848	endif
849
850	#### OpenSSL: Add the necessary libraries required, if enabled.
851	#
852	ifdef FOSSIL_ENABLE_SSL
853	LIB += -lssl -lcrypto -lgdi32
854	endif
855
856	#### Tcl: Add the necessary libraries required, if enabled.
857	#
858	ifdef FOSSIL_ENABLE_TCL
	@@ -861,29 +866,31 @@
861
862	#### Extra arguments for linking the finished binary. Fossil needs
863	# to link against the Z-Lib compression library. There are no
864	# other mandatory dependencies.
865	#
866	LIB += -lmingwex
867
868	#### When not using the miniz compression library, zlib is required.
869	#
870	ifndef FOSSIL_ENABLE_MINIZ
871	LIB += -lz
872	endif
873
874	#### These libraries MUST appear in the same order as they do for Tcl
875	# or linking with it will not work (exact reason unknown).
876	#
877	ifdef FOSSIL_ENABLE_TCL
878	ifdef FOSSIL_ENABLE_TCL_STUBS
879	LIB += -lkernel32 -lws2_32
880	else
881	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32


882	endif
883	else
884	LIB += -lkernel32 -lws2_32
885	endif
886
887	#### Tcl shell for use in running the fossil test suite. This is only
888	# used for testing.
889	#
	@@ -1066,14 +1073,14 @@
1066	$(OBJDIR)/cson_amalgamation.o
1067	}]
1068
1069	writeln {
1070	zlib:
1071	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1072
1073	clean-zlib:
1074	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
1075
1076	$(ZLIBDIR)/inffas86.o:
1077	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1078
1079	$(ZLIBDIR)/match.o:
1080

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -687,17 +687,22 @@
687
688	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
689	#
690	ifdef FOSSIL_ENABLE_TCL_STUBS
691	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
692	LIBTCL = $(XLDARG) -ltclstub86
693	endif
694	TCLTARGET = libtclstub86.a
695	else
696	LIBTCL = $(XLDARG) -ltcl86
697	TCLTARGET = binaries
698	endif
699
700	#### The prefix for all arguments that should be passed to the linker.
701	# GCC does not need this; however, other compilers may.
702	#
703	XLDARG =
704
705	#### C compiler for use in building executables that will run on the
706	# target platform. This is usually the same as BCCEXE, unless you
707	# are cross-compiling. This C compiler builds the finished binary
708	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -723,11 +728,11 @@
728	endif
729
730	#### When not using the miniz compression library, zlib is required.
731	#
732	ifndef FOSSIL_ENABLE_MINIZ
733	TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
734	endif
735
736	#### Compile resources for use in building executables that will run
737	# on the target platform.
738	#
	@@ -737,21 +742,21 @@
742	RCC += -I$(ZINCDIR)
743	endif
744
745	# With HTTPS support
746	ifdef FOSSIL_ENABLE_SSL
747	TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
748	RCC += -I$(OPENSSLINCDIR)
749	endif
750
751	# With Tcl support
752	ifdef FOSSIL_ENABLE_TCL
753	ifdef FOSSIL_TCL_SOURCE
754	TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
755	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
756	else
757	TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
758	RCC += -I$(TCLINCDIR)
759	endif
760	endif
761
762	# With miniz (i.e. instead of zlib)
	@@ -842,17 +847,17 @@
847	endif
848
849	#### SQLite: If enabled, use the system SQLite library.
850	#
851	ifdef USE_SYSTEM_SQLITE
852	LIB += $(XLDARG) -lsqlite3
853	endif
854
855	#### OpenSSL: Add the necessary libraries required, if enabled.
856	#
857	ifdef FOSSIL_ENABLE_SSL
858	LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
859	endif
860
861	#### Tcl: Add the necessary libraries required, if enabled.
862	#
863	ifdef FOSSIL_ENABLE_TCL
	@@ -861,29 +866,31 @@
866
867	#### Extra arguments for linking the finished binary. Fossil needs
868	# to link against the Z-Lib compression library. There are no
869	# other mandatory dependencies.
870	#
871	LIB += $(XLDARG) -lmingwex
872
873	#### When not using the miniz compression library, zlib is required.
874	#
875	ifndef FOSSIL_ENABLE_MINIZ
876	LIB += $(XLDARG) -lz
877	endif
878
879	#### These libraries MUST appear in the same order as they do for Tcl
880	# or linking with it will not work (exact reason unknown).
881	#
882	ifdef FOSSIL_ENABLE_TCL
883	ifdef FOSSIL_ENABLE_TCL_STUBS
884	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
885	else
886	LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
887	LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
888	LIB += $(XLDARG) -lws2_32
889	endif
890	else
891	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
892	endif
893
894	#### Tcl shell for use in running the fossil test suite. This is only
895	# used for testing.
896	#
	@@ -1066,14 +1073,14 @@
1073	$(OBJDIR)/cson_amalgamation.o
1074	}]
1075
1076	writeln {
1077	zlib:
1078	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1079
1080	clean-zlib:
1081	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1082
1083	$(ZLIBDIR)/inffas86.o:
1084	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
1085
1086	$(ZLIBDIR)/match.o:
1087

M win/Makefile.mingw

+22 -15

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -203,17 +203,22 @@
203	203
204	204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	205	#
206	206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208		-LIBTCL = -ltclstub86
	208	+LIBTCL = $(XLDARG) -ltclstub86
209	209	endif
210	210	TCLTARGET = libtclstub86.a
211	211	else
212		-LIBTCL = -ltcl86
	212	+LIBTCL = $(XLDARG) -ltcl86
213	213	TCLTARGET = binaries
214	214	endif
	215	+
	216	+#### The prefix for all arguments that should be passed to the linker.
	217	+# GCC does not need this; however, other compilers may.
	218	+#
	219	+XLDARG =
215	220
216	221	#### C compiler for use in building executables that will run on the
217	222	# target platform. This is usually the same as BCCEXE, unless you
218	223	# are cross-compiling. This C compiler builds the finished binary
219	224	# for fossil. See BCC and BCCEXE above for the C compiler for
		@@ -239,11 +244,11 @@
239	244	endif
240	245
241	246	#### When not using the miniz compression library, zlib is required.
242	247	#
243	248	ifndef FOSSIL_ENABLE_MINIZ
244		-TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
	249	+TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
245	250	endif
246	251
247	252	#### Compile resources for use in building executables that will run
248	253	# on the target platform.
249	254	#
		@@ -253,21 +258,21 @@
253	258	RCC += -I$(ZINCDIR)
254	259	endif
255	260
256	261	# With HTTPS support
257	262	ifdef FOSSIL_ENABLE_SSL
258		-TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	263	+TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
259	264	RCC += -I$(OPENSSLINCDIR)
260	265	endif
261	266
262	267	# With Tcl support
263	268	ifdef FOSSIL_ENABLE_TCL
264	269	ifdef FOSSIL_TCL_SOURCE
265		-TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	270	+TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
266	271	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
267	272	else
268		-TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	273	+TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
269	274	RCC += -I$(TCLINCDIR)
270	275	endif
271	276	endif
272	277
273	278	# With miniz (i.e. instead of zlib)
		@@ -358,17 +363,17 @@
358	363	endif
359	364
360	365	#### SQLite: If enabled, use the system SQLite library.
361	366	#
362	367	ifdef USE_SYSTEM_SQLITE
363		-LIB += -lsqlite3
	368	+LIB += $(XLDARG) -lsqlite3
364	369	endif
365	370
366	371	#### OpenSSL: Add the necessary libraries required, if enabled.
367	372	#
368	373	ifdef FOSSIL_ENABLE_SSL
369		-LIB += -lssl -lcrypto -lgdi32
	374	+LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
370	375	endif
371	376
372	377	#### Tcl: Add the necessary libraries required, if enabled.
373	378	#
374	379	ifdef FOSSIL_ENABLE_TCL
		@@ -377,29 +382,31 @@
377	382
378	383	#### Extra arguments for linking the finished binary. Fossil needs
379	384	# to link against the Z-Lib compression library. There are no
380	385	# other mandatory dependencies.
381	386	#
382		-LIB += -lmingwex
	387	+LIB += $(XLDARG) -lmingwex
383	388
384	389	#### When not using the miniz compression library, zlib is required.
385	390	#
386	391	ifndef FOSSIL_ENABLE_MINIZ
387		-LIB += -lz
	392	+LIB += $(XLDARG) -lz
388	393	endif
389	394
390	395	#### These libraries MUST appear in the same order as they do for Tcl
391	396	# or linking with it will not work (exact reason unknown).
392	397	#
393	398	ifdef FOSSIL_ENABLE_TCL
394	399	ifdef FOSSIL_ENABLE_TCL_STUBS
395		-LIB += -lkernel32 -lws2_32
	400	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
396	401	else
397		-LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	402	+LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
	403	+LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
	404	+LIB += $(XLDARG) -lws2_32
398	405	endif
399	406	else
400		-LIB += -lkernel32 -lws2_32
	407	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
401	408	endif
402	409
403	410	#### Tcl shell for use in running the fossil test suite. This is only
404	411	# used for testing.
405	412	#
		@@ -973,14 +980,14 @@
973	980	$(OBJDIR)/th_tcl.o \
974	981	$(OBJDIR)/cson_amalgamation.o
975	982
976	983
977	984	zlib:
978		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
	985	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979	986
980	987	clean-zlib:
981		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
	988	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
982	989
983	990	$(ZLIBDIR)/inffas86.o:
984	991	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985	992
986	993	$(ZLIBDIR)/match.o:
987	994

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -203,17 +203,22 @@
203
204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	#
206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208	LIBTCL = -ltclstub86
209	endif
210	TCLTARGET = libtclstub86.a
211	else
212	LIBTCL = -ltcl86
213	TCLTARGET = binaries
214	endif





215
216	#### C compiler for use in building executables that will run on the
217	# target platform. This is usually the same as BCCEXE, unless you
218	# are cross-compiling. This C compiler builds the finished binary
219	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -239,11 +244,11 @@
239	endif
240
241	#### When not using the miniz compression library, zlib is required.
242	#
243	ifndef FOSSIL_ENABLE_MINIZ
244	TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
245	endif
246
247	#### Compile resources for use in building executables that will run
248	# on the target platform.
249	#
	@@ -253,21 +258,21 @@
253	RCC += -I$(ZINCDIR)
254	endif
255
256	# With HTTPS support
257	ifdef FOSSIL_ENABLE_SSL
258	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
259	RCC += -I$(OPENSSLINCDIR)
260	endif
261
262	# With Tcl support
263	ifdef FOSSIL_ENABLE_TCL
264	ifdef FOSSIL_TCL_SOURCE
265	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
266	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
267	else
268	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
269	RCC += -I$(TCLINCDIR)
270	endif
271	endif
272
273	# With miniz (i.e. instead of zlib)
	@@ -358,17 +363,17 @@
358	endif
359
360	#### SQLite: If enabled, use the system SQLite library.
361	#
362	ifdef USE_SYSTEM_SQLITE
363	LIB += -lsqlite3
364	endif
365
366	#### OpenSSL: Add the necessary libraries required, if enabled.
367	#
368	ifdef FOSSIL_ENABLE_SSL
369	LIB += -lssl -lcrypto -lgdi32
370	endif
371
372	#### Tcl: Add the necessary libraries required, if enabled.
373	#
374	ifdef FOSSIL_ENABLE_TCL
	@@ -377,29 +382,31 @@
377
378	#### Extra arguments for linking the finished binary. Fossil needs
379	# to link against the Z-Lib compression library. There are no
380	# other mandatory dependencies.
381	#
382	LIB += -lmingwex
383
384	#### When not using the miniz compression library, zlib is required.
385	#
386	ifndef FOSSIL_ENABLE_MINIZ
387	LIB += -lz
388	endif
389
390	#### These libraries MUST appear in the same order as they do for Tcl
391	# or linking with it will not work (exact reason unknown).
392	#
393	ifdef FOSSIL_ENABLE_TCL
394	ifdef FOSSIL_ENABLE_TCL_STUBS
395	LIB += -lkernel32 -lws2_32
396	else
397	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32


398	endif
399	else
400	LIB += -lkernel32 -lws2_32
401	endif
402
403	#### Tcl shell for use in running the fossil test suite. This is only
404	# used for testing.
405	#
	@@ -973,14 +980,14 @@
973	$(OBJDIR)/th_tcl.o \
974	$(OBJDIR)/cson_amalgamation.o
975
976
977	zlib:
978	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
980	clean-zlib:
981	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
983	$(ZLIBDIR)/inffas86.o:
984	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985
986	$(ZLIBDIR)/match.o:
987

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -203,17 +203,22 @@
203
204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	#
206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208	LIBTCL = $(XLDARG) -ltclstub86
209	endif
210	TCLTARGET = libtclstub86.a
211	else
212	LIBTCL = $(XLDARG) -ltcl86
213	TCLTARGET = binaries
214	endif
215
216	#### The prefix for all arguments that should be passed to the linker.
217	# GCC does not need this; however, other compilers may.
218	#
219	XLDARG =
220
221	#### C compiler for use in building executables that will run on the
222	# target platform. This is usually the same as BCCEXE, unless you
223	# are cross-compiling. This C compiler builds the finished binary
224	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -239,11 +244,11 @@
244	endif
245
246	#### When not using the miniz compression library, zlib is required.
247	#
248	ifndef FOSSIL_ENABLE_MINIZ
249	TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
250	endif
251
252	#### Compile resources for use in building executables that will run
253	# on the target platform.
254	#
	@@ -253,21 +258,21 @@
258	RCC += -I$(ZINCDIR)
259	endif
260
261	# With HTTPS support
262	ifdef FOSSIL_ENABLE_SSL
263	TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
264	RCC += -I$(OPENSSLINCDIR)
265	endif
266
267	# With Tcl support
268	ifdef FOSSIL_ENABLE_TCL
269	ifdef FOSSIL_TCL_SOURCE
270	TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
271	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
272	else
273	TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
274	RCC += -I$(TCLINCDIR)
275	endif
276	endif
277
278	# With miniz (i.e. instead of zlib)
	@@ -358,17 +363,17 @@
363	endif
364
365	#### SQLite: If enabled, use the system SQLite library.
366	#
367	ifdef USE_SYSTEM_SQLITE
368	LIB += $(XLDARG) -lsqlite3
369	endif
370
371	#### OpenSSL: Add the necessary libraries required, if enabled.
372	#
373	ifdef FOSSIL_ENABLE_SSL
374	LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
375	endif
376
377	#### Tcl: Add the necessary libraries required, if enabled.
378	#
379	ifdef FOSSIL_ENABLE_TCL
	@@ -377,29 +382,31 @@
382
383	#### Extra arguments for linking the finished binary. Fossil needs
384	# to link against the Z-Lib compression library. There are no
385	# other mandatory dependencies.
386	#
387	LIB += $(XLDARG) -lmingwex
388
389	#### When not using the miniz compression library, zlib is required.
390	#
391	ifndef FOSSIL_ENABLE_MINIZ
392	LIB += $(XLDARG) -lz
393	endif
394
395	#### These libraries MUST appear in the same order as they do for Tcl
396	# or linking with it will not work (exact reason unknown).
397	#
398	ifdef FOSSIL_ENABLE_TCL
399	ifdef FOSSIL_ENABLE_TCL_STUBS
400	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
401	else
402	LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
403	LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
404	LIB += $(XLDARG) -lws2_32
405	endif
406	else
407	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
408	endif
409
410	#### Tcl shell for use in running the fossil test suite. This is only
411	# used for testing.
412	#
	@@ -973,14 +980,14 @@
980	$(OBJDIR)/th_tcl.o \
981	$(OBJDIR)/cson_amalgamation.o
982
983
984	zlib:
985	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
986
987	clean-zlib:
988	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
989
990	$(ZLIBDIR)/inffas86.o:
991	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
992
993	$(ZLIBDIR)/match.o:
994

M win/Makefile.mingw.mistachkin

+23 -16

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -203,17 +203,22 @@
203	203
204	204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	205	#
206	206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208		-LIBTCL = -ltclstub86
	208	+LIBTCL = $(XLDARG) -ltclstub86
209	209	endif
210	210	TCLTARGET = libtclstub86.a
211	211	else
212		-LIBTCL = -ltcl86
	212	+LIBTCL = $(XLDARG) -ltcl86
213	213	TCLTARGET = binaries
214	214	endif
	215	+
	216	+#### The prefix for all arguments that should be passed to the linker.
	217	+# GCC does not need this; however, other compilers may.
	218	+#
	219	+XLDARG =
215	220
216	221	#### C compiler for use in building executables that will run on the
217	222	# target platform. This is usually the same as BCCEXE, unless you
218	223	# are cross-compiling. This C compiler builds the finished binary
219	224	# for fossil. See BCC and BCCEXE above for the C compiler for
		@@ -239,11 +244,11 @@
239	244	endif
240	245
241	246	#### When not using the miniz compression library, zlib is required.
242	247	#
243	248	ifndef FOSSIL_ENABLE_MINIZ
244		-TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
	249	+TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
245	250	endif
246	251
247	252	#### Compile resources for use in building executables that will run
248	253	# on the target platform.
249	254	#
		@@ -253,21 +258,21 @@
253	258	RCC += -I$(ZINCDIR)
254	259	endif
255	260
256	261	# With HTTPS support
257	262	ifdef FOSSIL_ENABLE_SSL
258		-TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	263	+TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
259	264	RCC += -I$(OPENSSLINCDIR)
260	265	endif
261	266
262	267	# With Tcl support
263	268	ifdef FOSSIL_ENABLE_TCL
264	269	ifdef FOSSIL_TCL_SOURCE
265		-TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	270	+TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
266	271	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
267	272	else
268		-TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	273	+TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
269	274	RCC += -I$(TCLINCDIR)
270	275	endif
271	276	endif
272	277
273	278	# With miniz (i.e. instead of zlib)
		@@ -358,17 +363,17 @@
358	363	endif
359	364
360	365	#### SQLite: If enabled, use the system SQLite library.
361	366	#
362	367	ifdef USE_SYSTEM_SQLITE
363		-LIB += -lsqlite3
	368	+LIB += $(XLDARG) -lsqlite3
364	369	endif
365	370
366	371	#### OpenSSL: Add the necessary libraries required, if enabled.
367	372	#
368	373	ifdef FOSSIL_ENABLE_SSL
369		-LIB += -lssl -lcrypto -lgdi32
	374	+LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
370	375	endif
371	376
372	377	#### Tcl: Add the necessary libraries required, if enabled.
373	378	#
374	379	ifdef FOSSIL_ENABLE_TCL
		@@ -377,29 +382,31 @@
377	382
378	383	#### Extra arguments for linking the finished binary. Fossil needs
379	384	# to link against the Z-Lib compression library. There are no
380	385	# other mandatory dependencies.
381	386	#
382		-LIB += -lmingwex
	387	+LIB += $(XLDARG) -lmingwex
383	388
384	389	#### When not using the miniz compression library, zlib is required.
385	390	#
386	391	ifndef FOSSIL_ENABLE_MINIZ
387		-LIB += -lz
	392	+LIB += $(XLDARG) -lz
388	393	endif
389	394
390	395	#### These libraries MUST appear in the same order as they do for Tcl
391	396	# or linking with it will not work (exact reason unknown).
392	397	#
393	398	ifdef FOSSIL_ENABLE_TCL
394	399	ifdef FOSSIL_ENABLE_TCL_STUBS
395		-LIB += -lkernel32 -lws2_32
	400	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
396	401	else
397		-LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	402	+LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
	403	+LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
	404	+LIB += $(XLDARG) -lws2_32
398	405	endif
399	406	else
400		-LIB += -lkernel32 -lws2_32
	407	+LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
401	408	endif
402	409
403	410	#### Tcl shell for use in running the fossil test suite. This is only
404	411	# used for testing.
405	412	#
		@@ -973,14 +980,14 @@
973	980	$(OBJDIR)/th_tcl.o \
974	981	$(OBJDIR)/cson_amalgamation.o
975	982
976	983
977	984	zlib:
978		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
	985	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979	986
980	987	clean-zlib:
981		- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
	988	+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
982	989
983	990	$(ZLIBDIR)/inffas86.o:
984	991	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985	992
986	993	$(ZLIBDIR)/match.o:
		@@ -2136,11 +2143,11 @@
2136	2143	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
2137	2144	-DSQLITE_ENABLE_DBSTAT_VTAB \
2138	2145	-DSQLITE_ENABLE_JSON1 \
2139	2146	-DSQLITE_ENABLE_FTS5 \
2140	2147	-DSQLITE_WIN32_NO_ANSI \
2141		- -D_HAVE__MINGW_H \
	2148	+ $(MINGW_OPTIONS) \
2142	2149	-DSQLITE_USE_MALLOC_H \
2143	2150	-DSQLITE_USE_MSIZE
2144	2151
2145	2152	SHELL_OPTIONS = -Dmain=sqlite3_shell \
2146	2153	-DSQLITE_SHELL_IS_UTF8=1 \
2147	2154

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -203,17 +203,22 @@
203
204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	#
206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208	LIBTCL = -ltclstub86
209	endif
210	TCLTARGET = libtclstub86.a
211	else
212	LIBTCL = -ltcl86
213	TCLTARGET = binaries
214	endif





215
216	#### C compiler for use in building executables that will run on the
217	# target platform. This is usually the same as BCCEXE, unless you
218	# are cross-compiling. This C compiler builds the finished binary
219	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -239,11 +244,11 @@
239	endif
240
241	#### When not using the miniz compression library, zlib is required.
242	#
243	ifndef FOSSIL_ENABLE_MINIZ
244	TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
245	endif
246
247	#### Compile resources for use in building executables that will run
248	# on the target platform.
249	#
	@@ -253,21 +258,21 @@
253	RCC += -I$(ZINCDIR)
254	endif
255
256	# With HTTPS support
257	ifdef FOSSIL_ENABLE_SSL
258	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
259	RCC += -I$(OPENSSLINCDIR)
260	endif
261
262	# With Tcl support
263	ifdef FOSSIL_ENABLE_TCL
264	ifdef FOSSIL_TCL_SOURCE
265	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
266	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
267	else
268	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
269	RCC += -I$(TCLINCDIR)
270	endif
271	endif
272
273	# With miniz (i.e. instead of zlib)
	@@ -358,17 +363,17 @@
358	endif
359
360	#### SQLite: If enabled, use the system SQLite library.
361	#
362	ifdef USE_SYSTEM_SQLITE
363	LIB += -lsqlite3
364	endif
365
366	#### OpenSSL: Add the necessary libraries required, if enabled.
367	#
368	ifdef FOSSIL_ENABLE_SSL
369	LIB += -lssl -lcrypto -lgdi32
370	endif
371
372	#### Tcl: Add the necessary libraries required, if enabled.
373	#
374	ifdef FOSSIL_ENABLE_TCL
	@@ -377,29 +382,31 @@
377
378	#### Extra arguments for linking the finished binary. Fossil needs
379	# to link against the Z-Lib compression library. There are no
380	# other mandatory dependencies.
381	#
382	LIB += -lmingwex
383
384	#### When not using the miniz compression library, zlib is required.
385	#
386	ifndef FOSSIL_ENABLE_MINIZ
387	LIB += -lz
388	endif
389
390	#### These libraries MUST appear in the same order as they do for Tcl
391	# or linking with it will not work (exact reason unknown).
392	#
393	ifdef FOSSIL_ENABLE_TCL
394	ifdef FOSSIL_ENABLE_TCL_STUBS
395	LIB += -lkernel32 -lws2_32
396	else
397	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32


398	endif
399	else
400	LIB += -lkernel32 -lws2_32
401	endif
402
403	#### Tcl shell for use in running the fossil test suite. This is only
404	# used for testing.
405	#
	@@ -973,14 +980,14 @@
973	$(OBJDIR)/th_tcl.o \
974	$(OBJDIR)/cson_amalgamation.o
975
976
977	zlib:
978	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
979
980	clean-zlib:
981	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
982
983	$(ZLIBDIR)/inffas86.o:
984	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
985
986	$(ZLIBDIR)/match.o:
	@@ -2136,11 +2143,11 @@
2136	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
2137	-DSQLITE_ENABLE_DBSTAT_VTAB \
2138	-DSQLITE_ENABLE_JSON1 \
2139	-DSQLITE_ENABLE_FTS5 \
2140	-DSQLITE_WIN32_NO_ANSI \
2141	-D_HAVE__MINGW_H \
2142	-DSQLITE_USE_MALLOC_H \
2143	-DSQLITE_USE_MSIZE
2144
2145	SHELL_OPTIONS = -Dmain=sqlite3_shell \
2146	-DSQLITE_SHELL_IS_UTF8=1 \
2147

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -203,17 +203,22 @@
203
204	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
205	#
206	ifdef FOSSIL_ENABLE_TCL_STUBS
207	ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
208	LIBTCL = $(XLDARG) -ltclstub86
209	endif
210	TCLTARGET = libtclstub86.a
211	else
212	LIBTCL = $(XLDARG) -ltcl86
213	TCLTARGET = binaries
214	endif
215
216	#### The prefix for all arguments that should be passed to the linker.
217	# GCC does not need this; however, other compilers may.
218	#
219	XLDARG =
220
221	#### C compiler for use in building executables that will run on the
222	# target platform. This is usually the same as BCCEXE, unless you
223	# are cross-compiling. This C compiler builds the finished binary
224	# for fossil. See BCC and BCCEXE above for the C compiler for
	@@ -239,11 +244,11 @@
244	endif
245
246	#### When not using the miniz compression library, zlib is required.
247	#
248	ifndef FOSSIL_ENABLE_MINIZ
249	TCC += $(XLDARG) -L$(ZLIBDIR) -I$(ZINCDIR)
250	endif
251
252	#### Compile resources for use in building executables that will run
253	# on the target platform.
254	#
	@@ -253,21 +258,21 @@
258	RCC += -I$(ZINCDIR)
259	endif
260
261	# With HTTPS support
262	ifdef FOSSIL_ENABLE_SSL
263	TCC += $(XLDARG) -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
264	RCC += -I$(OPENSSLINCDIR)
265	endif
266
267	# With Tcl support
268	ifdef FOSSIL_ENABLE_TCL
269	ifdef FOSSIL_TCL_SOURCE
270	TCC += $(XLDARG) -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
271	RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
272	else
273	TCC += $(XLDARG) -L$(TCLLIBDIR) -I$(TCLINCDIR)
274	RCC += -I$(TCLINCDIR)
275	endif
276	endif
277
278	# With miniz (i.e. instead of zlib)
	@@ -358,17 +363,17 @@
363	endif
364
365	#### SQLite: If enabled, use the system SQLite library.
366	#
367	ifdef USE_SYSTEM_SQLITE
368	LIB += $(XLDARG) -lsqlite3
369	endif
370
371	#### OpenSSL: Add the necessary libraries required, if enabled.
372	#
373	ifdef FOSSIL_ENABLE_SSL
374	LIB += $(XLDARG) -lssl $(XLDARG) -lcrypto $(XLDARG) -lgdi32
375	endif
376
377	#### Tcl: Add the necessary libraries required, if enabled.
378	#
379	ifdef FOSSIL_ENABLE_TCL
	@@ -377,29 +382,31 @@
382
383	#### Extra arguments for linking the finished binary. Fossil needs
384	# to link against the Z-Lib compression library. There are no
385	# other mandatory dependencies.
386	#
387	LIB += $(XLDARG) -lmingwex
388
389	#### When not using the miniz compression library, zlib is required.
390	#
391	ifndef FOSSIL_ENABLE_MINIZ
392	LIB += $(XLDARG) -lz
393	endif
394
395	#### These libraries MUST appear in the same order as they do for Tcl
396	# or linking with it will not work (exact reason unknown).
397	#
398	ifdef FOSSIL_ENABLE_TCL
399	ifdef FOSSIL_ENABLE_TCL_STUBS
400	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
401	else
402	LIB += $(XLDARG) -lnetapi32 $(XLDARG) -lkernel32
403	LIB += $(XLDARG) -luser32 $(XLDARG) -ladvapi32
404	LIB += $(XLDARG) -lws2_32
405	endif
406	else
407	LIB += $(XLDARG) -lkernel32 $(XLDARG) -lws2_32
408	endif
409
410	#### Tcl shell for use in running the fossil test suite. This is only
411	# used for testing.
412	#
	@@ -973,14 +980,14 @@
980	$(OBJDIR)/th_tcl.o \
981	$(OBJDIR)/cson_amalgamation.o
982
983
984	zlib:
985	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
986
987	clean-zlib:
988	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
989
990	$(ZLIBDIR)/inffas86.o:
991	$(TCC) -c -o $@ -DASMINF -I$(ZLIBDIR) -O3 $(ZLIBDIR)/contrib/inflate86/inffas86.c
992
993	$(ZLIBDIR)/match.o:
	@@ -2136,11 +2143,11 @@
2143	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
2144	-DSQLITE_ENABLE_DBSTAT_VTAB \
2145	-DSQLITE_ENABLE_JSON1 \
2146	-DSQLITE_ENABLE_FTS5 \
2147	-DSQLITE_WIN32_NO_ANSI \
2148	$(MINGW_OPTIONS) \
2149	-DSQLITE_USE_MALLOC_H \
2150	-DSQLITE_USE_MSIZE
2151
2152	SHELL_OPTIONS = -Dmain=sqlite3_shell \
2153	-DSQLITE_SHELL_IS_UTF8=1 \
2154

Fossil SCM

Keyboard Shortcuts