Fossil SCM
Better modularization of arguments for the OpenSSL configuration used by the MSVC makefile.
Commit
20af0a8e5c5cbb4be365b61b413ffaf024dc364c
Parent
89d9baa3e241ee1…
2 files changed
+8
-8
+8
-8
+8
-8
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1188,23 +1188,23 @@ | ||
| 1188 | 1188 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1189 | 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | 1191 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1192 | 1192 | !message Using 'x64' platform for OpenSSL... |
| 1193 | -SSLCONFIG = VC-WIN64A | |
| 1193 | +SSLCONFIG = VC-WIN64A no-asm | |
| 1194 | 1194 | SSLSETUP = ms\do_win64a.bat |
| 1195 | -SSLNMAKE = ms\nt.mak | |
| 1195 | +SSLNMAKE = ms\nt.mak all | |
| 1196 | 1196 | !elseif "$(PLATFORM)"=="ia64" |
| 1197 | 1197 | !message Using 'ia64' platform for OpenSSL... |
| 1198 | -SSLCONFIG = VC-WIN64I | |
| 1198 | +SSLCONFIG = VC-WIN64I no-asm | |
| 1199 | 1199 | SSLSETUP = ms\do_win64i.bat |
| 1200 | -SSLNMAKE = ms\nt.mak | |
| 1200 | +SSLNMAKE = ms\nt.mak all | |
| 1201 | 1201 | !else |
| 1202 | 1202 | !message Assuming 'x86' platform for OpenSSL... |
| 1203 | -SSLCONFIG = VC-WIN32 | |
| 1203 | +SSLCONFIG = VC-WIN32 no-asm | |
| 1204 | 1204 | SSLSETUP = ms\do_ms.bat |
| 1205 | -SSLNMAKE = ms\nt.mak | |
| 1205 | +SSLNMAKE = ms\nt.mak all | |
| 1206 | 1206 | !endif |
| 1207 | 1207 | !endif |
| 1208 | 1208 | |
| 1209 | 1209 | !ifdef FOSSIL_ENABLE_TCL |
| 1210 | 1210 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1345,13 +1345,13 @@ | ||
| 1345 | 1345 | openssl: |
| 1346 | 1346 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 1347 | 1347 | !if "$(PERLDIR)" != "" |
| 1348 | 1348 | @set PATH=$(PERLDIR);$(PATH) |
| 1349 | 1349 | !endif |
| 1350 | - @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd | |
| 1350 | + @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd | |
| 1351 | 1351 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1352 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd | |
| 1352 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd | |
| 1353 | 1353 | !endif |
| 1354 | 1354 | |
| 1355 | 1355 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1356 | 1356 | APPTARGETS = $(APPTARGETS) zlib |
| 1357 | 1357 | !endif |
| 1358 | 1358 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1188,23 +1188,23 @@ | |
| 1188 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1192 | !message Using 'x64' platform for OpenSSL... |
| 1193 | SSLCONFIG = VC-WIN64A |
| 1194 | SSLSETUP = ms\do_win64a.bat |
| 1195 | SSLNMAKE = ms\nt.mak |
| 1196 | !elseif "$(PLATFORM)"=="ia64" |
| 1197 | !message Using 'ia64' platform for OpenSSL... |
| 1198 | SSLCONFIG = VC-WIN64I |
| 1199 | SSLSETUP = ms\do_win64i.bat |
| 1200 | SSLNMAKE = ms\nt.mak |
| 1201 | !else |
| 1202 | !message Assuming 'x86' platform for OpenSSL... |
| 1203 | SSLCONFIG = VC-WIN32 |
| 1204 | SSLSETUP = ms\do_ms.bat |
| 1205 | SSLNMAKE = ms\nt.mak |
| 1206 | !endif |
| 1207 | !endif |
| 1208 | |
| 1209 | !ifdef FOSSIL_ENABLE_TCL |
| 1210 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1345,13 +1345,13 @@ | |
| 1345 | openssl: |
| 1346 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 1347 | !if "$(PERLDIR)" != "" |
| 1348 | @set PATH=$(PERLDIR);$(PATH) |
| 1349 | !endif |
| 1350 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd |
| 1351 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1352 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd |
| 1353 | !endif |
| 1354 | |
| 1355 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1356 | APPTARGETS = $(APPTARGETS) zlib |
| 1357 | !endif |
| 1358 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1188,23 +1188,23 @@ | |
| 1188 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1189 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1190 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1191 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1192 | !message Using 'x64' platform for OpenSSL... |
| 1193 | SSLCONFIG = VC-WIN64A no-asm |
| 1194 | SSLSETUP = ms\do_win64a.bat |
| 1195 | SSLNMAKE = ms\nt.mak all |
| 1196 | !elseif "$(PLATFORM)"=="ia64" |
| 1197 | !message Using 'ia64' platform for OpenSSL... |
| 1198 | SSLCONFIG = VC-WIN64I no-asm |
| 1199 | SSLSETUP = ms\do_win64i.bat |
| 1200 | SSLNMAKE = ms\nt.mak all |
| 1201 | !else |
| 1202 | !message Assuming 'x86' platform for OpenSSL... |
| 1203 | SSLCONFIG = VC-WIN32 no-asm |
| 1204 | SSLSETUP = ms\do_ms.bat |
| 1205 | SSLNMAKE = ms\nt.mak all |
| 1206 | !endif |
| 1207 | !endif |
| 1208 | |
| 1209 | !ifdef FOSSIL_ENABLE_TCL |
| 1210 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -1345,13 +1345,13 @@ | |
| 1345 | openssl: |
| 1346 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 1347 | !if "$(PERLDIR)" != "" |
| 1348 | @set PATH=$(PERLDIR);$(PATH) |
| 1349 | !endif |
| 1350 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 1351 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 1352 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd |
| 1353 | !endif |
| 1354 | |
| 1355 | !ifndef FOSSIL_ENABLE_MINIZ |
| 1356 | APPTARGETS = $(APPTARGETS) zlib |
| 1357 | !endif |
| 1358 |
+8
-8
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -47,23 +47,23 @@ | ||
| 47 | 47 | SSLINCDIR = $(SSLDIR)\inc32 |
| 48 | 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | 50 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 51 | 51 | !message Using 'x64' platform for OpenSSL... |
| 52 | -SSLCONFIG = VC-WIN64A | |
| 52 | +SSLCONFIG = VC-WIN64A no-asm | |
| 53 | 53 | SSLSETUP = ms\do_win64a.bat |
| 54 | -SSLNMAKE = ms\nt.mak | |
| 54 | +SSLNMAKE = ms\nt.mak all | |
| 55 | 55 | !elseif "$(PLATFORM)"=="ia64" |
| 56 | 56 | !message Using 'ia64' platform for OpenSSL... |
| 57 | -SSLCONFIG = VC-WIN64I | |
| 57 | +SSLCONFIG = VC-WIN64I no-asm | |
| 58 | 58 | SSLSETUP = ms\do_win64i.bat |
| 59 | -SSLNMAKE = ms\nt.mak | |
| 59 | +SSLNMAKE = ms\nt.mak all | |
| 60 | 60 | !else |
| 61 | 61 | !message Assuming 'x86' platform for OpenSSL... |
| 62 | -SSLCONFIG = VC-WIN32 | |
| 62 | +SSLCONFIG = VC-WIN32 no-asm | |
| 63 | 63 | SSLSETUP = ms\do_ms.bat |
| 64 | -SSLNMAKE = ms\nt.mak | |
| 64 | +SSLNMAKE = ms\nt.mak all | |
| 65 | 65 | !endif |
| 66 | 66 | !endif |
| 67 | 67 | |
| 68 | 68 | !ifdef FOSSIL_ENABLE_TCL |
| 69 | 69 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -420,13 +420,13 @@ | ||
| 420 | 420 | openssl: |
| 421 | 421 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 422 | 422 | !if "$(PERLDIR)" != "" |
| 423 | 423 | @set PATH=$(PERLDIR);$(PATH) |
| 424 | 424 | !endif |
| 425 | - @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd | |
| 425 | + @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd | |
| 426 | 426 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 427 | - @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd | |
| 427 | + @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd | |
| 428 | 428 | !endif |
| 429 | 429 | |
| 430 | 430 | !ifndef FOSSIL_ENABLE_MINIZ |
| 431 | 431 | APPTARGETS = $(APPTARGETS) zlib |
| 432 | 432 | !endif |
| 433 | 433 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -47,23 +47,23 @@ | |
| 47 | SSLINCDIR = $(SSLDIR)\inc32 |
| 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 51 | !message Using 'x64' platform for OpenSSL... |
| 52 | SSLCONFIG = VC-WIN64A |
| 53 | SSLSETUP = ms\do_win64a.bat |
| 54 | SSLNMAKE = ms\nt.mak |
| 55 | !elseif "$(PLATFORM)"=="ia64" |
| 56 | !message Using 'ia64' platform for OpenSSL... |
| 57 | SSLCONFIG = VC-WIN64I |
| 58 | SSLSETUP = ms\do_win64i.bat |
| 59 | SSLNMAKE = ms\nt.mak |
| 60 | !else |
| 61 | !message Assuming 'x86' platform for OpenSSL... |
| 62 | SSLCONFIG = VC-WIN32 |
| 63 | SSLSETUP = ms\do_ms.bat |
| 64 | SSLNMAKE = ms\nt.mak |
| 65 | !endif |
| 66 | !endif |
| 67 | |
| 68 | !ifdef FOSSIL_ENABLE_TCL |
| 69 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -420,13 +420,13 @@ | |
| 420 | openssl: |
| 421 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 422 | !if "$(PERLDIR)" != "" |
| 423 | @set PATH=$(PERLDIR);$(PATH) |
| 424 | !endif |
| 425 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) no-asm && popd |
| 426 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 427 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) all && popd |
| 428 | !endif |
| 429 | |
| 430 | !ifndef FOSSIL_ENABLE_MINIZ |
| 431 | APPTARGETS = $(APPTARGETS) zlib |
| 432 | !endif |
| 433 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -47,23 +47,23 @@ | |
| 47 | SSLINCDIR = $(SSLDIR)\inc32 |
| 48 | SSLLIBDIR = $(SSLDIR)\out32 |
| 49 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 50 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 51 | !message Using 'x64' platform for OpenSSL... |
| 52 | SSLCONFIG = VC-WIN64A no-asm |
| 53 | SSLSETUP = ms\do_win64a.bat |
| 54 | SSLNMAKE = ms\nt.mak all |
| 55 | !elseif "$(PLATFORM)"=="ia64" |
| 56 | !message Using 'ia64' platform for OpenSSL... |
| 57 | SSLCONFIG = VC-WIN64I no-asm |
| 58 | SSLSETUP = ms\do_win64i.bat |
| 59 | SSLNMAKE = ms\nt.mak all |
| 60 | !else |
| 61 | !message Assuming 'x86' platform for OpenSSL... |
| 62 | SSLCONFIG = VC-WIN32 no-asm |
| 63 | SSLSETUP = ms\do_ms.bat |
| 64 | SSLNMAKE = ms\nt.mak all |
| 65 | !endif |
| 66 | !endif |
| 67 | |
| 68 | !ifdef FOSSIL_ENABLE_TCL |
| 69 | TCLDIR = $(B)\compat\tcl-8.6 |
| @@ -420,13 +420,13 @@ | |
| 420 | openssl: |
| 421 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 422 | !if "$(PERLDIR)" != "" |
| 423 | @set PATH=$(PERLDIR);$(PATH) |
| 424 | !endif |
| 425 | @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd |
| 426 | @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd |
| 427 | @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd |
| 428 | !endif |
| 429 | |
| 430 | !ifndef FOSSIL_ENABLE_MINIZ |
| 431 | APPTARGETS = $(APPTARGETS) zlib |
| 432 | !endif |
| 433 |