Fossil SCM

First attempt at getting the MSVC makefile working with OpenSSL 1.1.0.

mistachkin 2016-09-08 20:09 openssl-1.1
Commit 22049abd47aa41282556c001d90346a9245fa1c0
Parent b03f15635dd356b…
1 file changed +5 -23
~ win/Makefile.msc
M win/Makefile.msc
+5 -23
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,18 +99,19 @@
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103103
 SSLDIR = $(B)\compat\openssl-1.1.0
104
-SSLINCDIR = $(SSLDIR)\inc32
104
+SSLINCDIR = $(SSLDIR)\include
105105
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106
-SSLLIBDIR = $(SSLDIR)\out32dll
106
+SSLLIBDIR = $(SSLDIR)
107107
 !else
108
-SSLLIBDIR = $(SSLDIR)\out32
108
+SSLLIBDIR = $(SSLDIR)
109109
 !endif
110
+SSLNMAKE = makefile all
110111
 SSLLFLAGS = /nologo /opt:ref /debug
111
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112113
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113114
 !message Using 'x64' platform for OpenSSL...
114115
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115116
 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116117
 SSLCONFIG = VC-WIN64A no-asm
@@ -117,16 +118,10 @@
117118
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118119
 SSLCONFIG = $(SSLCONFIG) shared
119120
 !else
120121
 SSLCONFIG = $(SSLCONFIG) no-shared
121122
 !endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
125
-!else
126
-SSLNMAKE = ms\nt.mak all
127
-!endif
128123
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129124
 !if $(FOSSIL_DYNAMIC_BUILD)==0
130125
 SSLCFLAGS = -DOPENSSL_NO_SSL3
131126
 !endif
132127
 !elseif "$(PLATFORM)"=="ia64"
@@ -137,16 +132,10 @@
137132
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138133
 SSLCONFIG = $(SSLCONFIG) shared
139134
 !else
140135
 SSLCONFIG = $(SSLCONFIG) no-shared
141136
 !endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
145
-!else
146
-SSLNMAKE = ms\nt.mak all
147
-!endif
148137
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149138
 !if $(FOSSIL_DYNAMIC_BUILD)==0
150139
 SSLCFLAGS = -DOPENSSL_NO_SSL3
151140
 !endif
152141
 !else
@@ -157,16 +146,10 @@
157146
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158147
 SSLCONFIG = $(SSLCONFIG) shared
159148
 !else
160149
 SSLCONFIG = $(SSLCONFIG) no-shared
161150
 !endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
165
-!else
166
-SSLNMAKE = ms\nt.mak all
167
-!endif
168151
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169152
 !if $(FOSSIL_DYNAMIC_BUILD)==0
170153
 SSLCFLAGS = -DOPENSSL_NO_SSL3
171154
 !endif
172155
 !endif
@@ -666,11 +649,10 @@
666649
 @echo Building OpenSSL from "$(SSLDIR)"...
667650
 !if "$(PERLDIR)" != ""
668651
 @set PATH=$(PERLDIR);$(PATH)
669652
 !endif
670653
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
671
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
672654
 !if $(FOSSIL_ENABLE_WINXP)!=0
673655
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
674656
 !else
675657
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
676658
 !endif
677659
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,18 +99,19 @@
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
 
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
@@ -117,16 +118,10 @@
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
@@ -137,16 +132,10 @@
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
152 !else
@@ -157,16 +146,10 @@
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3
171 !endif
172 !endif
@@ -666,11 +649,10 @@
666 @echo Building OpenSSL from "$(SSLDIR)"...
667 !if "$(PERLDIR)" != ""
668 @set PATH=$(PERLDIR);$(PATH)
669 !endif
670 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
671 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
672 !if $(FOSSIL_ENABLE_WINXP)!=0
673 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
674 !else
675 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
676 !endif
677
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,18 +99,19 @@
99 USE_SEE = 0
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 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
116 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
117 SSLCONFIG = VC-WIN64A no-asm
@@ -117,16 +118,10 @@
118 !if $(FOSSIL_DYNAMIC_BUILD)!=0
119 SSLCONFIG = $(SSLCONFIG) shared
120 !else
121 SSLCONFIG = $(SSLCONFIG) no-shared
122 !endif
 
 
 
 
 
 
123 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
124 !if $(FOSSIL_DYNAMIC_BUILD)==0
125 SSLCFLAGS = -DOPENSSL_NO_SSL3
126 !endif
127 !elseif "$(PLATFORM)"=="ia64"
@@ -137,16 +132,10 @@
132 !if $(FOSSIL_DYNAMIC_BUILD)!=0
133 SSLCONFIG = $(SSLCONFIG) shared
134 !else
135 SSLCONFIG = $(SSLCONFIG) no-shared
136 !endif
 
 
 
 
 
 
137 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
138 !if $(FOSSIL_DYNAMIC_BUILD)==0
139 SSLCFLAGS = -DOPENSSL_NO_SSL3
140 !endif
141 !else
@@ -157,16 +146,10 @@
146 !if $(FOSSIL_DYNAMIC_BUILD)!=0
147 SSLCONFIG = $(SSLCONFIG) shared
148 !else
149 SSLCONFIG = $(SSLCONFIG) no-shared
150 !endif
 
 
 
 
 
 
151 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
152 !if $(FOSSIL_DYNAMIC_BUILD)==0
153 SSLCFLAGS = -DOPENSSL_NO_SSL3
154 !endif
155 !endif
@@ -666,11 +649,10 @@
649 @echo Building OpenSSL from "$(SSLDIR)"...
650 !if "$(PERLDIR)" != ""
651 @set PATH=$(PERLDIR);$(PATH)
652 !endif
653 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
654 !if $(FOSSIL_ENABLE_WINXP)!=0
655 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
656 !else
657 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
658 !endif
659

Keyboard Shortcuts

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