Fossil

Check-in [bd25cd18]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Simplify SSLLIBDIR change from the previous check-in.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | openssl-1.1
Files: files | file ages | folders
SHA1:bd25cd185d1273cbe26726307c40b0788a63f276
User & Date: mistachkin 2016-09-08 20:10:33
Context
2016-09-08
20:17
Merge updates from trunk. check-in: fc995eb9 user: mistachkin tags: openssl-1.1
20:10
Simplify SSLLIBDIR change from the previous check-in. check-in: bd25cd18 user: mistachkin tags: openssl-1.1
20:09
First attempt at getting the MSVC makefile working with OpenSSL 1.1.0. check-in: 22049abd user: mistachkin tags: openssl-1.1
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to win/Makefile.msc.

98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
!ifndef USE_SEE
USE_SEE = 0
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
SSLDIR    = $(B)\compat\openssl-1.1.0
SSLINCDIR = $(SSLDIR)\include
!if $(FOSSIL_DYNAMIC_BUILD)!=0
SSLLIBDIR = $(SSLDIR)
!else
SSLLIBDIR = $(SSLDIR)
!endif
SSLNMAKE  = makefile all
SSLLFLAGS = /nologo /opt:ref /debug
SSLLIB    = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
!message Using 'x64' platform for OpenSSL...
# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
# SSLCONFIG = VC-WIN64A no-asm no-ssl3







<

<
<
<







98
99
100
101
102
103
104

105



106
107
108
109
110
111
112
!ifndef USE_SEE
USE_SEE = 0
!endif

!if $(FOSSIL_ENABLE_SSL)!=0
SSLDIR    = $(B)\compat\openssl-1.1.0
SSLINCDIR = $(SSLDIR)\include

SSLLIBDIR = $(SSLDIR)



SSLNMAKE  = makefile all
SSLLFLAGS = /nologo /opt:ref /debug
SSLLIB    = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
!message Using 'x64' platform for OpenSSL...
# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
# SSLCONFIG = VC-WIN64A no-asm no-ssl3