Fossil SCM

Better mingw/mingw64 support for (cross-)compile on Linux, Darwin, Cygwin or Msys.

jan.nijtmans 2012-08-23 10:13 UTC trunk

Commit cc2aa92ef84424727c2c469816ad6519a8f1683f

Parent 4e66a969465c26b…

5 files changed +16 -7 +17 -7 +18 -9 -64 -1

~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin - win/Makefile.mingw32cross - win/icon.rc

M src/makemake.tcl

+16 -7

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -327,12 +327,21 @@
327	327	#
328	328	# This file is automatically generated. Instead of editing this
329	329	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
330	330	# to regenerate this file.
331	331	#
332		-# This is a makefile for us on windows using MinGW.
	332	+# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
	333	+#
	334	+
	335	+####
	336	+#
	337	+# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
333	338	#
	339	+PREFIX=i686-pc-mingw32-
	340	+#PREFIX=i686-w64-mingw32-
	341	+#PREFIX=x86_64-w64-mingw32-
	342	+
334	343	#### The toplevel directory of the source tree. Fossil can be built
335	344	# in a directory that is separate from the source tree. Just change
336	345	# the following to point from the build directory to the src/ folder.
337	346	#
338	347	SRCDIR = src
		@@ -414,11 +423,11 @@
414	423	# will run on the target platform. This is usually the same
415	424	# as BCC, unless you are cross-compiling. This C compiler builds
416	425	# the finished binary for fossil. The BCC compiler above is used
417	426	# for building intermediate code-generator tools.
418	427	#
419		-TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	428	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
420	429
421	430	# With HTTPS support
422	431	ifdef FOSSIL_ENABLE_SSL
423	432	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
424	433	endif
		@@ -516,13 +525,13 @@
516	525	}
517	526
518	527	writeln {
519	528	all: $(OBJDIR) $(APPNAME)
520	529
521		-$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
522		- cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
523		- windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
	530	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
	531	+ cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
	532	+ $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
524	533
525	534	install: $(APPNAME)
526	535	mkdir -p $(INSTALLDIR)
527	536	mv $(APPNAME) $(INSTALLDIR)
528	537
		@@ -559,12 +568,12 @@
559	568
560	569	ifdef FOSSIL_ENABLE_TCL
561	570	EXTRAOBJ += $(OBJDIR)/th_tcl.o
562	571	endif
563	572
564		-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
565		- $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
	573	+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
	574	+ $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
566	575
567	576	# This rule prevents make from using its default rules to try build
568	577	# an executable named "manifest" out of the file named "manifest.c"
569	578	#
570	579	$(SRCDIR)/../manifest:
571	580

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -327,12 +327,21 @@
327	#
328	# This file is automatically generated. Instead of editing this
329	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
330	# to regenerate this file.
331	#
332	# This is a makefile for us on windows using MinGW.





333	#




334	#### The toplevel directory of the source tree. Fossil can be built
335	# in a directory that is separate from the source tree. Just change
336	# the following to point from the build directory to the src/ folder.
337	#
338	SRCDIR = src
	@@ -414,11 +423,11 @@
414	# will run on the target platform. This is usually the same
415	# as BCC, unless you are cross-compiling. This C compiler builds
416	# the finished binary for fossil. The BCC compiler above is used
417	# for building intermediate code-generator tools.
418	#
419	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
420
421	# With HTTPS support
422	ifdef FOSSIL_ENABLE_SSL
423	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
424	endif
	@@ -516,13 +525,13 @@
516	}
517
518	writeln {
519	all: $(OBJDIR) $(APPNAME)
520
521	$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
522	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
523	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
524
525	install: $(APPNAME)
526	mkdir -p $(INSTALLDIR)
527	mv $(APPNAME) $(INSTALLDIR)
528
	@@ -559,12 +568,12 @@
559
560	ifdef FOSSIL_ENABLE_TCL
561	EXTRAOBJ += $(OBJDIR)/th_tcl.o
562	endif
563
564	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
565	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
566
567	# This rule prevents make from using its default rules to try build
568	# an executable named "manifest" out of the file named "manifest.c"
569	#
570	$(SRCDIR)/../manifest:
571

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -327,12 +327,21 @@
327	#
328	# This file is automatically generated. Instead of editing this
329	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
330	# to regenerate this file.
331	#
332	# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
333	#
334
335	####
336	#
337	# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
338	#
339	PREFIX=i686-pc-mingw32-
340	#PREFIX=i686-w64-mingw32-
341	#PREFIX=x86_64-w64-mingw32-
342
343	#### The toplevel directory of the source tree. Fossil can be built
344	# in a directory that is separate from the source tree. Just change
345	# the following to point from the build directory to the src/ folder.
346	#
347	SRCDIR = src
	@@ -414,11 +423,11 @@
423	# will run on the target platform. This is usually the same
424	# as BCC, unless you are cross-compiling. This C compiler builds
425	# the finished binary for fossil. The BCC compiler above is used
426	# for building intermediate code-generator tools.
427	#
428	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
429
430	# With HTTPS support
431	ifdef FOSSIL_ENABLE_SSL
432	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
433	endif
	@@ -516,13 +525,13 @@
525	}
526
527	writeln {
528	all: $(OBJDIR) $(APPNAME)
529
530	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
531	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
532	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
533
534	install: $(APPNAME)
535	mkdir -p $(INSTALLDIR)
536	mv $(APPNAME) $(INSTALLDIR)
537
	@@ -559,12 +568,12 @@
568
569	ifdef FOSSIL_ENABLE_TCL
570	EXTRAOBJ += $(OBJDIR)/th_tcl.o
571	endif
572
573	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
574	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
575
576	# This rule prevents make from using its default rules to try build
577	# an executable named "manifest" out of the file named "manifest.c"
578	#
579	$(SRCDIR)/../manifest:
580

M win/Makefile.mingw

+17 -7

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -6,12 +6,21 @@
6	6	#
7	7	# This file is automatically generated. Instead of editing this
8	8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	9	# to regenerate this file.
10	10	#
11		-# This is a makefile for us on windows using MinGW.
	11	+# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
	12	+#
	13	+
	14	+####
	15	+#
	16	+# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
12	17	#
	18	+PREFIX=i686-pc-mingw32-
	19	+#PREFIX=i686-w64-mingw32-
	20	+#PREFIX=x86_64-w64-mingw32-
	21	+
13	22	#### The toplevel directory of the source tree. Fossil can be built
14	23	# in a directory that is separate from the source tree. Just change
15	24	# the following to point from the build directory to the src/ folder.
16	25	#
17	26	SRCDIR = src
		@@ -93,11 +102,11 @@
93	102	# will run on the target platform. This is usually the same
94	103	# as BCC, unless you are cross-compiling. This C compiler builds
95	104	# the finished binary for fossil. The BCC compiler above is used
96	105	# for building intermediate code-generator tools.
97	106	#
98		-TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	107	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99	108
100	109	# With HTTPS support
101	110	ifdef FOSSIL_ENABLE_SSL
102	111	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103	112	endif
		@@ -479,13 +488,14 @@
479	488	VERSION = $(OBJDIR)/version.exe
480	489
481	490
482	491	all: $(OBJDIR) $(APPNAME)
483	492
484		-$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
485		- cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
486		- windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
	493	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
	494	+ cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
	495	+ cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
	496	+ $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
487	497
488	498	install: $(APPNAME)
489	499	mkdir -p $(INSTALLDIR)
490	500	mv $(APPNAME) $(INSTALLDIR)
491	501
		@@ -517,12 +527,12 @@
517	527
518	528	ifdef FOSSIL_ENABLE_TCL
519	529	EXTRAOBJ += $(OBJDIR)/th_tcl.o
520	530	endif
521	531
522		-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
523		- $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
	532	+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
	533	+ $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
524	534
525	535	# This rule prevents make from using its default rules to try build
526	536	# an executable named "manifest" out of the file named "manifest.c"
527	537	#
528	538	$(SRCDIR)/../manifest:
529	539

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -6,12 +6,21 @@
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.





12	#




13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
17	SRCDIR = src
	@@ -93,11 +102,11 @@
93	# will run on the target platform. This is usually the same
94	# as BCC, unless you are cross-compiling. This C compiler builds
95	# the finished binary for fossil. The BCC compiler above is used
96	# for building intermediate code-generator tools.
97	#
98	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100	# With HTTPS support
101	ifdef FOSSIL_ENABLE_SSL
102	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103	endif
	@@ -479,13 +488,14 @@
479	VERSION = $(OBJDIR)/version.exe
480
481
482	all: $(OBJDIR) $(APPNAME)
483
484	$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
485	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
486	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o

487
488	install: $(APPNAME)
489	mkdir -p $(INSTALLDIR)
490	mv $(APPNAME) $(INSTALLDIR)
491
	@@ -517,12 +527,12 @@
517
518	ifdef FOSSIL_ENABLE_TCL
519	EXTRAOBJ += $(OBJDIR)/th_tcl.o
520	endif
521
522	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
523	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
524
525	# This rule prevents make from using its default rules to try build
526	# an executable named "manifest" out of the file named "manifest.c"
527	#
528	$(SRCDIR)/../manifest:
529

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -6,12 +6,21 @@
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
12	#
13
14	####
15	#
16	# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
17	#
18	PREFIX=i686-pc-mingw32-
19	#PREFIX=i686-w64-mingw32-
20	#PREFIX=x86_64-w64-mingw32-
21
22	#### The toplevel directory of the source tree. Fossil can be built
23	# in a directory that is separate from the source tree. Just change
24	# the following to point from the build directory to the src/ folder.
25	#
26	SRCDIR = src
	@@ -93,11 +102,11 @@
102	# will run on the target platform. This is usually the same
103	# as BCC, unless you are cross-compiling. This C compiler builds
104	# the finished binary for fossil. The BCC compiler above is used
105	# for building intermediate code-generator tools.
106	#
107	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
109	# With HTTPS support
110	ifdef FOSSIL_ENABLE_SSL
111	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
112	endif
	@@ -479,13 +488,14 @@
488	VERSION = $(OBJDIR)/version.exe
489
490
491	all: $(OBJDIR) $(APPNAME)
492
493	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
494	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
495	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
496	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
497
498	install: $(APPNAME)
499	mkdir -p $(INSTALLDIR)
500	mv $(APPNAME) $(INSTALLDIR)
501
	@@ -517,12 +527,12 @@
527
528	ifdef FOSSIL_ENABLE_TCL
529	EXTRAOBJ += $(OBJDIR)/th_tcl.o
530	endif
531
532	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
533	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
534
535	# This rule prevents make from using its default rules to try build
536	# an executable named "manifest" out of the file named "manifest.c"
537	#
538	$(SRCDIR)/../manifest:
539

M win/Makefile.mingw.mistachkin

+18 -9

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -6,12 +6,21 @@
6	6	#
7	7	# This file is automatically generated. Instead of editing this
8	8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	9	# to regenerate this file.
10	10	#
11		-# This is a makefile for us on windows using MinGW.
	11	+# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
	12	+#
	13	+
	14	+####
	15	+#
	16	+# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
12	17	#
	18	+PREFIX=i686-pc-mingw32-
	19	+#PREFIX=i686-w64-mingw32-
	20	+#PREFIX=x86_64-w64-mingw32-
	21	+
13	22	#### The toplevel directory of the source tree. Fossil can be built
14	23	# in a directory that is separate from the source tree. Just change
15	24	# the following to point from the build directory to the src/ folder.
16	25	#
17	26	SRCDIR = src
		@@ -93,11 +102,11 @@
93	102	# will run on the target platform. This is usually the same
94	103	# as BCC, unless you are cross-compiling. This C compiler builds
95	104	# the finished binary for fossil. The BCC compiler above is used
96	105	# for building intermediate code-generator tools.
97	106	#
98		-TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	107	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99	108
100	109	# With HTTPS support
101	110	ifdef FOSSIL_ENABLE_SSL
102	111	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103	112	endif
		@@ -133,16 +142,16 @@
133	142	# chroot jail.
134	143	#
135	144	LIB = -static
136	145	LIB += -lmingwex -lz
137	146
138		-# OpenSSL: Add the necessary libaries required, if enabled.
	147	+# OpenSSL: Add the necessary libraries required, if enabled.
139	148	ifdef FOSSIL_ENABLE_SSL
140	149	LIB += -lssl -lcrypto -lgdi32
141	150	endif
142	151
143		-# Tcl: Add the necessary libaries required, if enabled.
	152	+# Tcl: Add the necessary libraries required, if enabled.
144	153	ifdef FOSSIL_ENABLE_TCL
145	154	LIB += $(LIBTCL)
146	155	endif
147	156
148	157	#### These libraries MUST appear in the same order as they do for Tcl
		@@ -479,13 +488,13 @@
479	488	VERSION = $(OBJDIR)/version.exe
480	489
481	490
482	491	all: $(OBJDIR) $(APPNAME)
483	492
484		-$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
485		- cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
486		- windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
	493	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
	494	+ cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
	495	+ $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
487	496
488	497	install: $(APPNAME)
489	498	mkdir -p $(INSTALLDIR)
490	499	mv $(APPNAME) $(INSTALLDIR)
491	500
		@@ -517,12 +526,12 @@
517	526
518	527	ifdef FOSSIL_ENABLE_TCL
519	528	EXTRAOBJ += $(OBJDIR)/th_tcl.o
520	529	endif
521	530
522		-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
523		- $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
	531	+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
	532	+ $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
524	533
525	534	# This rule prevents make from using its default rules to try build
526	535	# an executable named "manifest" out of the file named "manifest.c"
527	536	#
528	537	$(SRCDIR)/../manifest:
529	538
530	539	DELETED win/Makefile.mingw32cross
531	540	DELETED win/icon.rc

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -6,12 +6,21 @@
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.





12	#




13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
17	SRCDIR = src
	@@ -93,11 +102,11 @@
93	# will run on the target platform. This is usually the same
94	# as BCC, unless you are cross-compiling. This C compiler builds
95	# the finished binary for fossil. The BCC compiler above is used
96	# for building intermediate code-generator tools.
97	#
98	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100	# With HTTPS support
101	ifdef FOSSIL_ENABLE_SSL
102	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103	endif
	@@ -133,16 +142,16 @@
133	# chroot jail.
134	#
135	LIB = -static
136	LIB += -lmingwex -lz
137
138	# OpenSSL: Add the necessary libaries required, if enabled.
139	ifdef FOSSIL_ENABLE_SSL
140	LIB += -lssl -lcrypto -lgdi32
141	endif
142
143	# Tcl: Add the necessary libaries required, if enabled.
144	ifdef FOSSIL_ENABLE_TCL
145	LIB += $(LIBTCL)
146	endif
147
148	#### These libraries MUST appear in the same order as they do for Tcl
	@@ -479,13 +488,13 @@
479	VERSION = $(OBJDIR)/version.exe
480
481
482	all: $(OBJDIR) $(APPNAME)
483
484	$(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
485	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
486	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
487
488	install: $(APPNAME)
489	mkdir -p $(INSTALLDIR)
490	mv $(APPNAME) $(INSTALLDIR)
491
	@@ -517,12 +526,12 @@
517
518	ifdef FOSSIL_ENABLE_TCL
519	EXTRAOBJ += $(OBJDIR)/th_tcl.o
520	endif
521
522	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
523	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
524
525	# This rule prevents make from using its default rules to try build
526	# an executable named "manifest" out of the file named "manifest.c"
527	#
528	$(SRCDIR)/../manifest:
529
530	ELETED win/Makefile.mingw32cross
531	ELETED win/icon.rc

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -6,12 +6,21 @@
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
12	#
13
14	####
15	#
16	# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
17	#
18	PREFIX=i686-pc-mingw32-
19	#PREFIX=i686-w64-mingw32-
20	#PREFIX=x86_64-w64-mingw32-
21
22	#### The toplevel directory of the source tree. Fossil can be built
23	# in a directory that is separate from the source tree. Just change
24	# the following to point from the build directory to the src/ folder.
25	#
26	SRCDIR = src
	@@ -93,11 +102,11 @@
102	# will run on the target platform. This is usually the same
103	# as BCC, unless you are cross-compiling. This C compiler builds
104	# the finished binary for fossil. The BCC compiler above is used
105	# for building intermediate code-generator tools.
106	#
107	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
109	# With HTTPS support
110	ifdef FOSSIL_ENABLE_SSL
111	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
112	endif
	@@ -133,16 +142,16 @@
142	# chroot jail.
143	#
144	LIB = -static
145	LIB += -lmingwex -lz
146
147	# OpenSSL: Add the necessary libraries required, if enabled.
148	ifdef FOSSIL_ENABLE_SSL
149	LIB += -lssl -lcrypto -lgdi32
150	endif
151
152	# Tcl: Add the necessary libraries required, if enabled.
153	ifdef FOSSIL_ENABLE_TCL
154	LIB += $(LIBTCL)
155	endif
156
157	#### These libraries MUST appear in the same order as they do for Tcl
	@@ -479,13 +488,13 @@
488	VERSION = $(OBJDIR)/version.exe
489
490
491	all: $(OBJDIR) $(APPNAME)
492
493	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
494	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
495	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
496
497	install: $(APPNAME)
498	mkdir -p $(INSTALLDIR)
499	mv $(APPNAME) $(INSTALLDIR)
500
	@@ -517,12 +526,12 @@
526
527	ifdef FOSSIL_ENABLE_TCL
528	EXTRAOBJ += $(OBJDIR)/th_tcl.o
529	endif
530
531	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
532	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
533
534	# This rule prevents make from using its default rules to try build
535	# an executable named "manifest" out of the file named "manifest.c"
536	#
537	$(SRCDIR)/../manifest:
538
539	ELETED win/Makefile.mingw32cross
540	ELETED win/icon.rc

D win/Makefile.mingw32cross

-64

		--- a/win/Makefile.mingw32cross
		+++ b/win/Makefile.mingw32cross
		@@ -1,64 +0,0 @@
1		-#!/usr/bin/make
2		-# This makefile is for use with the Mingw32 cross compiler on Linux
3		-#
4		-#### The toplevel directory of the source tree. Fossil can be built
5		-# in a directory that is separate from the source tree. Just change
6		-# the following to point from the build directory to the src/ folder.
7		-#
8		-SRCDIR = ./src
9		-OBJDIR = ./wobj
10		-
11		-#### C Compiler and options for use in building executables that
12		-# will run on the platform that is doing the build. This is used
13		-# to compile code-generator programs as part of the build process.
14		-# See TCC below for the C compiler for building the finished binary.
15		-#
16		-BCC = gcc -s -O2
17		-
18		-#### The suffix to add to executable files. ".exe" for windows.
19		-# Nothing for unix.
20		-#
21		-E = .exe
22		-
23		-#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
24		-#
25		-FOSSIL_ENABLE_SSL=1
26		-
27		-#### C Compile and options for use in building executables that
28		-# will run on the target platform. This is usually the same
29		-# as BCC, unless you are cross-compiling. This C compiler builds
30		-# the finished binary for fossil. The BCC compiler above is used
31		-# for building intermediate code-generator tools.
32		-#
33		-#TCC = gcc -O6
34		-#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
35		-#TCC = gcc -g -Os -Wall
36		-#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include
37		-TCC=i686-pc-mingw32-gcc -O3 -s -Wall -DFOSSIL_I18N=0
38		-
39		-# With HTTPS support
40		-ifdef FOSSIL_ENABLE_SSL
41		-TCC += -DFOSSIL_ENABLE_SSL=1
42		-endif
43		-
44		-#### Extra arguments for linking the finished binary. Fossil needs
45		-# to link against the Z-Lib compression library. There are no
46		-# other dependencies. We sometimes add the -static option here
47		-# so that we can build a static executable that will run in a
48		-# chroot jail.
49		-#
50		-LIB=-lz -lssl -lcrypto -lwsock32 -lgdi32
51		-CFLAGS=-O3 -s
52		-LDFLAGS=-s
53		-
54		-#### Tcl shell for use in running the fossil testsuite.
55		-#
56		-TCLSH = tclsh
57		-
58		-#### Include a configuration file that can override any one of these settings.
59		-#
60		--include config.w32
61		-
62		-# You should not need to change anything below this line
63		-###############################################################################
64		-include $(SRCDIR)/main.mk

	--- a/win/Makefile.mingw32cross
	+++ b/win/Makefile.mingw32cross
	@@ -1,64 +0,0 @@
1	#!/usr/bin/make
2	# This makefile is for use with the Mingw32 cross compiler on Linux
3	#
4	#### The toplevel directory of the source tree. Fossil can be built
5	# in a directory that is separate from the source tree. Just change
6	# the following to point from the build directory to the src/ folder.
7	#
8	SRCDIR = ./src
9	OBJDIR = ./wobj
10
11	#### C Compiler and options for use in building executables that
12	# will run on the platform that is doing the build. This is used
13	# to compile code-generator programs as part of the build process.
14	# See TCC below for the C compiler for building the finished binary.
15	#
16	BCC = gcc -s -O2
17
18	#### The suffix to add to executable files. ".exe" for windows.
19	# Nothing for unix.
20	#
21	E = .exe
22
23	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
24	#
25	FOSSIL_ENABLE_SSL=1
26
27	#### C Compile and options for use in building executables that
28	# will run on the target platform. This is usually the same
29	# as BCC, unless you are cross-compiling. This C compiler builds
30	# the finished binary for fossil. The BCC compiler above is used
31	# for building intermediate code-generator tools.
32	#
33	#TCC = gcc -O6
34	#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
35	#TCC = gcc -g -Os -Wall
36	#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include
37	TCC=i686-pc-mingw32-gcc -O3 -s -Wall -DFOSSIL_I18N=0
38
39	# With HTTPS support
40	ifdef FOSSIL_ENABLE_SSL
41	TCC += -DFOSSIL_ENABLE_SSL=1
42	endif
43
44	#### Extra arguments for linking the finished binary. Fossil needs
45	# to link against the Z-Lib compression library. There are no
46	# other dependencies. We sometimes add the -static option here
47	# so that we can build a static executable that will run in a
48	# chroot jail.
49	#
50	LIB=-lz -lssl -lcrypto -lwsock32 -lgdi32
51	CFLAGS=-O3 -s
52	LDFLAGS=-s
53
54	#### Tcl shell for use in running the fossil testsuite.
55	#
56	TCLSH = tclsh
57
58	#### Include a configuration file that can override any one of these settings.
59	#
60	-include config.w32
61
62	# You should not need to change anything below this line
63	###############################################################################
64	include $(SRCDIR)/main.mk

	--- a/win/Makefile.mingw32cross
	+++ b/win/Makefile.mingw32cross
	@@ -1,64 +0,0 @@

D win/icon.rc

-1

		--- a/win/icon.rc
		+++ b/win/icon.rc
		@@ -1 +0,0 @@
1		-ID ICON "../win/fossil.ico"

	--- a/win/icon.rc
	+++ b/win/icon.rc
	@@ -1 +0,0 @@
1	ID ICON "../win/fossil.ico"

	--- a/win/icon.rc
	+++ b/win/icon.rc
	@@ -1 +0,0 @@

Fossil SCM

Keyboard Shortcuts