Fossil SCM

Upgrade mingw and msc makefiles to use openssl-1.0.1f in stead of openssl-1.0.1e

jan.nijtmans 2014-01-09 10:41 trunk
Commit ef47028a3ef38a5729fe4207d1efc42bfaef0693
Parent cbcd7056b6c3cba…
4 files changed +4 -4 +2 -2 +2 -2 +2 -2
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -447,12 +447,12 @@
447447
 #### The directories where the OpenSSL include and library files are located.
448448
 # The recommended usage here is to use the Sysinternals junction tool
449449
 # to create a hard link between an "openssl-1.x" sub-directory of the
450450
 # Fossil source code directory and the target OpenSSL source directory.
451451
 #
452
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
453
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
452
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
453
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
454454
455455
 #### Either the directory where the Tcl library is installed or the Tcl
456456
 # source code directory resides (depending on the value of the macro
457457
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
458458
 # this directory must have "include" and "lib" sub-directories. If
@@ -1017,12 +1017,12 @@
10171017
10181018
 # Uncomment to enable SSL support
10191019
 # FOSSIL_ENABLE_SSL = 1
10201020
10211021
 !ifdef FOSSIL_ENABLE_SSL
1022
-SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
1023
-SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
1022
+SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1023
+SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
10241024
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10251025
 !endif
10261026
10271027
 # zlib options
10281028
 ZINCDIR = $(B)\compat\zlib
10291029
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -447,12 +447,12 @@
447 #### The directories where the OpenSSL include and library files are located.
448 # The recommended usage here is to use the Sysinternals junction tool
449 # to create a hard link between an "openssl-1.x" sub-directory of the
450 # Fossil source code directory and the target OpenSSL source directory.
451 #
452 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
453 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
454
455 #### Either the directory where the Tcl library is installed or the Tcl
456 # source code directory resides (depending on the value of the macro
457 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
458 # this directory must have "include" and "lib" sub-directories. If
@@ -1017,12 +1017,12 @@
1017
1018 # Uncomment to enable SSL support
1019 # FOSSIL_ENABLE_SSL = 1
1020
1021 !ifdef FOSSIL_ENABLE_SSL
1022 SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
1023 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
1024 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1025 !endif
1026
1027 # zlib options
1028 ZINCDIR = $(B)\compat\zlib
1029
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -447,12 +447,12 @@
447 #### The directories where the OpenSSL include and library files are located.
448 # The recommended usage here is to use the Sysinternals junction tool
449 # to create a hard link between an "openssl-1.x" sub-directory of the
450 # Fossil source code directory and the target OpenSSL source directory.
451 #
452 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
453 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
454
455 #### Either the directory where the Tcl library is installed or the Tcl
456 # source code directory resides (depending on the value of the macro
457 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
458 # this directory must have "include" and "lib" sub-directories. If
@@ -1017,12 +1017,12 @@
1017
1018 # Uncomment to enable SSL support
1019 # FOSSIL_ENABLE_SSL = 1
1020
1021 !ifdef FOSSIL_ENABLE_SSL
1022 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1023 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1024 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1025 !endif
1026
1027 # zlib options
1028 ZINCDIR = $(B)\compat\zlib
1029
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
2323
2424
 # Uncomment to enable SSL support
2525
 # FOSSIL_ENABLE_SSL = 1
2626
2727
 !ifdef FOSSIL_ENABLE_SSL
28
-SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
29
-SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
28
+SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29
+SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
3030
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3131
 !endif
3232
3333
 # zlib options
3434
 ZINCDIR = $(B)\compat\zlib
3535
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1e\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button