Fossil SCM

More changes to the MSVC makefile to make building with OpenSSL support easier.

mistachkin 2014-09-13 02:34 trunk

Commit 201e87a2511d74c6ab85c0a00225648441142340

Parent fe3c9db0753d244…

2 files changed +6 -2 +6 -2

M src/makemake.tcl

+6 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1153,11 +1153,15 @@
1153	1153	OBJDIR = .
1154	1154	OX = .
1155	1155	O = .obj
1156	1156	E = .exe
1157	1157	P = .pdb
1158		-PERLDIR =
	1158	+
	1159	+# Perl is only necessary if OpenSSL support is enabled and it must
	1160	+# be built from source code. The PERLDIR variable should point to
	1161	+# the directory containing the main Perl binary (i.e. "perl.exe").
	1162	+PERLDIR = C:\Perl\bin
1159	1163	PERL = perl.exe
1160	1164
1161	1165	# Uncomment to enable debug symbols
1162	1166	# DEBUG = 1
1163	1167
		@@ -1338,11 +1342,11 @@
1338	1342
1339	1343	!ifdef FOSSIL_ENABLE_SSL
1340	1344	APPTARGETS = $(APPTARGETS) openssl
1341	1345	!endif
1342	1346
1343		-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
	1347	+$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1344	1348	cd $(OX)
1345	1349	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1346	1350
1347	1351	$(OX)\linkopts: $B\win\Makefile.msc}
1348	1352	set redir {>}
1349	1353

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1153,11 +1153,15 @@
1153	OBJDIR = .
1154	OX = .
1155	O = .obj
1156	E = .exe
1157	P = .pdb
1158	PERLDIR =




1159	PERL = perl.exe
1160
1161	# Uncomment to enable debug symbols
1162	# DEBUG = 1
1163
	@@ -1338,11 +1342,11 @@
1338
1339	!ifdef FOSSIL_ENABLE_SSL
1340	APPTARGETS = $(APPTARGETS) openssl
1341	!endif
1342
1343	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
1344	cd $(OX)
1345	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1346
1347	$(OX)\linkopts: $B\win\Makefile.msc}
1348	set redir {>}
1349

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1153,11 +1153,15 @@
1153	OBJDIR = .
1154	OX = .
1155	O = .obj
1156	E = .exe
1157	P = .pdb
1158
1159	# Perl is only necessary if OpenSSL support is enabled and it must
1160	# be built from source code. The PERLDIR variable should point to
1161	# the directory containing the main Perl binary (i.e. "perl.exe").
1162	PERLDIR = C:\Perl\bin
1163	PERL = perl.exe
1164
1165	# Uncomment to enable debug symbols
1166	# DEBUG = 1
1167
	@@ -1338,11 +1342,11 @@
1342
1343	!ifdef FOSSIL_ENABLE_SSL
1344	APPTARGETS = $(APPTARGETS) openssl
1345	!endif
1346
1347	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1348	cd $(OX)
1349	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1350
1351	$(OX)\linkopts: $B\win\Makefile.msc}
1352	set redir {>}
1353

M win/Makefile.msc

+6 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -12,11 +12,15 @@
12	12	OBJDIR = .
13	13	OX = .
14	14	O = .obj
15	15	E = .exe
16	16	P = .pdb
17		-PERLDIR =
	17	+
	18	+# Perl is only necessary if OpenSSL support is enabled and it must
	19	+# be built from source code. The PERLDIR variable should point to
	20	+# the directory containing the main Perl binary (i.e. "perl.exe").
	21	+PERLDIR = C:\Perl\bin
18	22	PERL = perl.exe
19	23
20	24	# Uncomment to enable debug symbols
21	25	# DEBUG = 1
22	26
		@@ -413,11 +417,11 @@
413	417
414	418	!ifdef FOSSIL_ENABLE_SSL
415	419	APPTARGETS = $(APPTARGETS) openssl
416	420	!endif
417	421
418		-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
	422	+$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
419	423	cd $(OX)
420	424	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
421	425
422	426	$(OX)\linkopts: $B\win\Makefile.msc
423	427	echo $(OX)\add.obj > $@
424	428

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,11 +12,15 @@
12	OBJDIR = .
13	OX = .
14	O = .obj
15	E = .exe
16	P = .pdb
17	PERLDIR =




18	PERL = perl.exe
19
20	# Uncomment to enable debug symbols
21	# DEBUG = 1
22
	@@ -413,11 +417,11 @@
413
414	!ifdef FOSSIL_ENABLE_SSL
415	APPTARGETS = $(APPTARGETS) openssl
416	!endif
417
418	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
419	cd $(OX)
420	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
421
422	$(OX)\linkopts: $B\win\Makefile.msc
423	echo $(OX)\add.obj > $@
424

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,11 +12,15 @@
12	OBJDIR = .
13	OX = .
14	O = .obj
15	E = .exe
16	P = .pdb
17
18	# Perl is only necessary if OpenSSL support is enabled and it must
19	# be built from source code. The PERLDIR variable should point to
20	# the directory containing the main Perl binary (i.e. "perl.exe").
21	PERLDIR = C:\Perl\bin
22	PERL = perl.exe
23
24	# Uncomment to enable debug symbols
25	# DEBUG = 1
26
	@@ -413,11 +417,11 @@
417
418	!ifdef FOSSIL_ENABLE_SSL
419	APPTARGETS = $(APPTARGETS) openssl
420	!endif
421
422	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
423	cd $(OX)
424	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
425
426	$(OX)\linkopts: $B\win\Makefile.msc
427	echo $(OX)\add.obj > $@
428