Fossil SCM

Merge updates from trunk.

mistachkin 2014-08-25 20:52 UTC optionalMiniz merge

Commit 5735181c4db4330796248ce15a769a9f2ecf535b

Parent e38b1ab08775744…

4 files changed +1 -1 +1 -1 +1 -1 +1 -1

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

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1296,11 +1296,11 @@
1296	1296	!if "$(PERLDIR)" != ""
1297	1297	@set PATH=$(PERLDIR);$(PATH)
1298	1298	!endif
1299	1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301		- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
	1301	+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1302	1302	!endif
1303	1303
1304	1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	1306	!endif
1307	1307

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1296,11 +1296,11 @@
1296	!if "$(PERLDIR)" != ""
1297	@set PATH=$(PERLDIR);$(PATH)
1298	!endif
1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301	@pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302	!endif
1303
1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	!endif
1307

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1296,11 +1296,11 @@
1296	!if "$(PERLDIR)" != ""
1297	@set PATH=$(PERLDIR);$(PATH)
1298	!endif
1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1302	!endif
1303
1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	!endif
1307

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1296,11 +1296,11 @@
1296	1296	!if "$(PERLDIR)" != ""
1297	1297	@set PATH=$(PERLDIR);$(PATH)
1298	1298	!endif
1299	1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301		- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
	1301	+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1302	1302	!endif
1303	1303
1304	1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	1306	!endif
1307	1307

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1296,11 +1296,11 @@
1296	!if "$(PERLDIR)" != ""
1297	@set PATH=$(PERLDIR);$(PATH)
1298	!endif
1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301	@pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302	!endif
1303
1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	!endif
1307

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1296,11 +1296,11 @@
1296	!if "$(PERLDIR)" != ""
1297	@set PATH=$(PERLDIR);$(PATH)
1298	!endif
1299	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1302	!endif
1303
1304	!ifndef FOSSIL_ENABLE_MINIZ
1305	EXTRATARGETS = $(EXTRATARGETS) zlib
1306	!endif
1307

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -393,11 +393,11 @@
393	393	!if "$(PERLDIR)" != ""
394	394	@set PATH=$(PERLDIR);$(PATH)
395	395	!endif
396	396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398		- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
	398	+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399	399	!endif
400	400
401	401	!ifndef FOSSIL_ENABLE_MINIZ
402	402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	403	!endif
404	404

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -393,11 +393,11 @@
393	!if "$(PERLDIR)" != ""
394	@set PATH=$(PERLDIR);$(PATH)
395	!endif
396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398	@pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399	!endif
400
401	!ifndef FOSSIL_ENABLE_MINIZ
402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	!endif
404

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -393,11 +393,11 @@
393	!if "$(PERLDIR)" != ""
394	@set PATH=$(PERLDIR);$(PATH)
395	!endif
396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399	!endif
400
401	!ifndef FOSSIL_ENABLE_MINIZ
402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	!endif
404

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -393,11 +393,11 @@
393	393	!if "$(PERLDIR)" != ""
394	394	@set PATH=$(PERLDIR);$(PATH)
395	395	!endif
396	396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398		- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
	398	+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399	399	!endif
400	400
401	401	!ifndef FOSSIL_ENABLE_MINIZ
402	402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	403	!endif
404	404

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -393,11 +393,11 @@
393	!if "$(PERLDIR)" != ""
394	@set PATH=$(PERLDIR);$(PATH)
395	!endif
396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398	@pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399	!endif
400
401	!ifndef FOSSIL_ENABLE_MINIZ
402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	!endif
404

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -393,11 +393,11 @@
393	!if "$(PERLDIR)" != ""
394	@set PATH=$(PERLDIR);$(PATH)
395	!endif
396	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399	!endif
400
401	!ifndef FOSSIL_ENABLE_MINIZ
402	EXTRATARGETS = $(EXTRATARGETS) zlib
403	!endif
404

Keyboard Shortcuts

Open search /

Next entry (timeline) j

Previous entry (timeline) k

Open focused entry Enter

Show this help ?

Toggle theme Top nav button