diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-23 18:49:49 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-24 01:20:05 +0200 |
| commit | 77d90bd7ba4b93779e15fc5238271b156c31ea84 (patch) | |
| tree | bb5930c4b0df300ea2cf0d482c7ede25c20e2eda /openssl/makefile.mk | |
| parent | 5fbc20dab425bf6b7985b5b42dc9dbdecdce2774 (diff) | |
Fix OpenSSL build for x64 Windows
For wntmscx, pass the platform code as VC-WIN64A to the OpenSSL build
mechanism. Add the additional steps described in INSTALL.W64 to
do_ms.bat: generate uptable.asm and assemble it. Avoid a problem with
_vsnprintf by defining _CRT_NON_CONFORMING_SWPRINTFS.
Diffstat (limited to 'openssl/makefile.mk')
| -rw-r--r-- | openssl/makefile.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 9bd5d5054c20..d5efcf747cb4 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -152,8 +152,13 @@ OUT2BIN += out/libeay32.dll #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure CONFIGURE_ACTION=$(PERL) configure - CONFIGURE_FLAGS=VC-WIN32 no-idea - BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak +.IF "$(CPU") == "I" + OPENSSL_PLATFORM=VC-WIN32 +.ELSE + OPENSSL_PLATFORM=VC-WIN64A +.ENDIF + CONFIGURE_FLAGS=$(OPENSSL_PLATFORM) no-idea + BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) $(OPENSSL_PLATFORM)" && nmake -f ms/ntdll.mak OUT2LIB = out32dll$/ssleay32.lib OUT2LIB += out32dll$/libeay32.lib |