Fossil SCM

Simplify SSLLIBDIR change from the previous check-in.

mistachkin 2016-09-08 20:10 openssl-1.1
Commit bd25cd185d1273cbe26726307c40b0788a63f276
Parent 22049abd47aa412…
1 file changed -4
~ win/Makefile.msc
M win/Makefile.msc
-4
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -100,15 +100,11 @@
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103103
 SSLDIR = $(B)\compat\openssl-1.1.0
104104
 SSLINCDIR = $(SSLDIR)\include
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
106105
 SSLLIBDIR = $(SSLDIR)
107
-!else
108
-SSLLIBDIR = $(SSLDIR)
109
-!endif
110106
 SSLNMAKE = makefile all
111107
 SSLLFLAGS = /nologo /opt:ref /debug
112108
 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
113109
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
114110
 !message Using 'x64' platform for OpenSSL...
115111
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -100,15 +100,11 @@
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLNMAKE = makefile all
111 SSLLFLAGS = /nologo /opt:ref /debug
112 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
113 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
114 !message Using 'x64' platform for OpenSSL...
115
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -100,15 +100,11 @@
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0
104 SSLINCDIR = $(SSLDIR)\include
 
105 SSLLIBDIR = $(SSLDIR)
 
 
 
106 SSLNMAKE = makefile all
107 SSLLFLAGS = /nologo /opt:ref /debug
108 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
109 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
110 !message Using 'x64' platform for OpenSSL...
111

Keyboard Shortcuts

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