Fossil SCM

Permit building Fossil with MSVC on x64 with SSL enabled (and built 'automatically' as part of the overall build process).

mistachkin 2014-09-28 20:37 trunk

Commit 89d9baa3e241ee19a5469b93eb95066ecede147b

Parent e061a675e69cf8e…

2 files changed +19 -3 +19 -3

~ src/makemake.tcl ~ win/Makefile.msc

M src/makemake.tcl

+19 -3

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1186,10 +1186,26 @@
1186	1186	!ifdef FOSSIL_ENABLE_SSL
1187	1187	SSLDIR = $(B)\compat\openssl-1.0.1i
1188	1188	SSLINCDIR = $(SSLDIR)\inc32
1189	1189	SSLLIBDIR = $(SSLDIR)\out32
1190	1190	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
	1191	+!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	1192	+!message Using 'x64' platform for OpenSSL...
	1193	+SSLCONFIG = VC-WIN64A
	1194	+SSLSETUP = ms\do_win64a.bat
	1195	+SSLNMAKE = ms\nt.mak
	1196	+!elseif "$(PLATFORM)"=="ia64"
	1197	+!message Using 'ia64' platform for OpenSSL...
	1198	+SSLCONFIG = VC-WIN64I
	1199	+SSLSETUP = ms\do_win64i.bat
	1200	+SSLNMAKE = ms\nt.mak
	1201	+!else
	1202	+!message Assuming 'x86' platform for OpenSSL...
	1203	+SSLCONFIG = VC-WIN32
	1204	+SSLSETUP = ms\do_ms.bat
	1205	+SSLNMAKE = ms\nt.mak
	1206	+!endif
1191	1207	!endif
1192	1208
1193	1209	!ifdef FOSSIL_ENABLE_TCL
1194	1210	TCLDIR = $(B)\compat\tcl-8.6
1195	1211	TCLSRCDIR = $(TCLDIR)
		@@ -1329,13 +1345,13 @@
1329	1345	openssl:
1330	1346	@echo Building OpenSSL from "$(SSLDIR)"...
1331	1347	!if "$(PERLDIR)" != ""
1332	1348	@set PATH=$(PERLDIR);$(PATH)
1333	1349	!endif
1334		- @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1335		- @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1336		- @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
	1350	+ @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd
	1351	+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
	1352	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd
1337	1353	!endif
1338	1354
1339	1355	!ifndef FOSSIL_ENABLE_MINIZ
1340	1356	APPTARGETS = $(APPTARGETS) zlib
1341	1357	!endif
1342	1358

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1186,10 +1186,26 @@
1186	!ifdef FOSSIL_ENABLE_SSL
1187	SSLDIR = $(B)\compat\openssl-1.0.1i
1188	SSLINCDIR = $(SSLDIR)\inc32
1189	SSLLIBDIR = $(SSLDIR)\out32
1190	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
















1191	!endif
1192
1193	!ifdef FOSSIL_ENABLE_TCL
1194	TCLDIR = $(B)\compat\tcl-8.6
1195	TCLSRCDIR = $(TCLDIR)
	@@ -1329,13 +1345,13 @@
1329	openssl:
1330	@echo Building OpenSSL from "$(SSLDIR)"...
1331	!if "$(PERLDIR)" != ""
1332	@set PATH=$(PERLDIR);$(PATH)
1333	!endif
1334	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1335	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1336	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1337	!endif
1338
1339	!ifndef FOSSIL_ENABLE_MINIZ
1340	APPTARGETS = $(APPTARGETS) zlib
1341	!endif
1342

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1186,10 +1186,26 @@
1186	!ifdef FOSSIL_ENABLE_SSL
1187	SSLDIR = $(B)\compat\openssl-1.0.1i
1188	SSLINCDIR = $(SSLDIR)\inc32
1189	SSLLIBDIR = $(SSLDIR)\out32
1190	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1191	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1192	!message Using 'x64' platform for OpenSSL...
1193	SSLCONFIG = VC-WIN64A
1194	SSLSETUP = ms\do_win64a.bat
1195	SSLNMAKE = ms\nt.mak
1196	!elseif "$(PLATFORM)"=="ia64"
1197	!message Using 'ia64' platform for OpenSSL...
1198	SSLCONFIG = VC-WIN64I
1199	SSLSETUP = ms\do_win64i.bat
1200	SSLNMAKE = ms\nt.mak
1201	!else
1202	!message Assuming 'x86' platform for OpenSSL...
1203	SSLCONFIG = VC-WIN32
1204	SSLSETUP = ms\do_ms.bat
1205	SSLNMAKE = ms\nt.mak
1206	!endif
1207	!endif
1208
1209	!ifdef FOSSIL_ENABLE_TCL
1210	TCLDIR = $(B)\compat\tcl-8.6
1211	TCLSRCDIR = $(TCLDIR)
	@@ -1329,13 +1345,13 @@
1345	openssl:
1346	@echo Building OpenSSL from "$(SSLDIR)"...
1347	!if "$(PERLDIR)" != ""
1348	@set PATH=$(PERLDIR);$(PATH)
1349	!endif
1350	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd
1351	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1352	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd
1353	!endif
1354
1355	!ifndef FOSSIL_ENABLE_MINIZ
1356	APPTARGETS = $(APPTARGETS) zlib
1357	!endif
1358

M win/Makefile.msc

+19 -3

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -45,10 +45,26 @@
45	45	!ifdef FOSSIL_ENABLE_SSL
46	46	SSLDIR = $(B)\compat\openssl-1.0.1i
47	47	SSLINCDIR = $(SSLDIR)\inc32
48	48	SSLLIBDIR = $(SSLDIR)\out32
49	49	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
	50	+!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	51	+!message Using 'x64' platform for OpenSSL...
	52	+SSLCONFIG = VC-WIN64A
	53	+SSLSETUP = ms\do_win64a.bat
	54	+SSLNMAKE = ms\nt.mak
	55	+!elseif "$(PLATFORM)"=="ia64"
	56	+!message Using 'ia64' platform for OpenSSL...
	57	+SSLCONFIG = VC-WIN64I
	58	+SSLSETUP = ms\do_win64i.bat
	59	+SSLNMAKE = ms\nt.mak
	60	+!else
	61	+!message Assuming 'x86' platform for OpenSSL...
	62	+SSLCONFIG = VC-WIN32
	63	+SSLSETUP = ms\do_ms.bat
	64	+SSLNMAKE = ms\nt.mak
	65	+!endif
50	66	!endif
51	67
52	68	!ifdef FOSSIL_ENABLE_TCL
53	69	TCLDIR = $(B)\compat\tcl-8.6
54	70	TCLSRCDIR = $(TCLDIR)
		@@ -404,13 +420,13 @@
404	420	openssl:
405	421	@echo Building OpenSSL from "$(SSLDIR)"...
406	422	!if "$(PERLDIR)" != ""
407	423	@set PATH=$(PERLDIR);$(PATH)
408	424	!endif
409		- @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
410		- @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
411		- @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
	425	+ @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd
	426	+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
	427	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd
412	428	!endif
413	429
414	430	!ifndef FOSSIL_ENABLE_MINIZ
415	431	APPTARGETS = $(APPTARGETS) zlib
416	432	!endif
417	433

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -45,10 +45,26 @@
45	!ifdef FOSSIL_ENABLE_SSL
46	SSLDIR = $(B)\compat\openssl-1.0.1i
47	SSLINCDIR = $(SSLDIR)\inc32
48	SSLLIBDIR = $(SSLDIR)\out32
49	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
















50	!endif
51
52	!ifdef FOSSIL_ENABLE_TCL
53	TCLDIR = $(B)\compat\tcl-8.6
54	TCLSRCDIR = $(TCLDIR)
	@@ -404,13 +420,13 @@
404	openssl:
405	@echo Building OpenSSL from "$(SSLDIR)"...
406	!if "$(PERLDIR)" != ""
407	@set PATH=$(PERLDIR);$(PATH)
408	!endif
409	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
410	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
411	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
412	!endif
413
414	!ifndef FOSSIL_ENABLE_MINIZ
415	APPTARGETS = $(APPTARGETS) zlib
416	!endif
417

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -45,10 +45,26 @@
45	!ifdef FOSSIL_ENABLE_SSL
46	SSLDIR = $(B)\compat\openssl-1.0.1i
47	SSLINCDIR = $(SSLDIR)\inc32
48	SSLLIBDIR = $(SSLDIR)\out32
49	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
50	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
51	!message Using 'x64' platform for OpenSSL...
52	SSLCONFIG = VC-WIN64A
53	SSLSETUP = ms\do_win64a.bat
54	SSLNMAKE = ms\nt.mak
55	!elseif "$(PLATFORM)"=="ia64"
56	!message Using 'ia64' platform for OpenSSL...
57	SSLCONFIG = VC-WIN64I
58	SSLSETUP = ms\do_win64i.bat
59	SSLNMAKE = ms\nt.mak
60	!else
61	!message Assuming 'x86' platform for OpenSSL...
62	SSLCONFIG = VC-WIN32
63	SSLSETUP = ms\do_ms.bat
64	SSLNMAKE = ms\nt.mak
65	!endif
66	!endif
67
68	!ifdef FOSSIL_ENABLE_TCL
69	TCLDIR = $(B)\compat\tcl-8.6
70	TCLSRCDIR = $(TCLDIR)
	@@ -404,13 +420,13 @@
420	openssl:
421	@echo Building OpenSSL from "$(SSLDIR)"...
422	!if "$(PERLDIR)" != ""
423	@set PATH=$(PERLDIR);$(PATH)
424	!endif
425	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd
426	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
427	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd
428	!endif
429
430	!ifndef FOSSIL_ENABLE_MINIZ
431	APPTARGETS = $(APPTARGETS) zlib
432	!endif
433

Fossil SCM

Keyboard Shortcuts