diff options
author | Patrik Nyblom <[email protected]> | 2012-03-21 10:43:27 +0100 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2012-03-21 10:43:27 +0100 |
commit | 134b9781fe9528ec45fc9ddd6a721d7e54cde359 (patch) | |
tree | 9903c53ef120abad44da75ce0686b0689abc1313 /INSTALL-WIN32.md | |
parent | 6763de4ffecfeb56a69c5f763d221ba20d1eef7d (diff) | |
parent | 0d530cbf673476ea5aa0181015f38e572d26bf87 (diff) | |
download | otp-134b9781fe9528ec45fc9ddd6a721d7e54cde359.tar.gz otp-134b9781fe9528ec45fc9ddd6a721d7e54cde359.tar.bz2 otp-134b9781fe9528ec45fc9ddd6a721d7e54cde359.zip |
Merge branch 'pan/win_doc_fix/OTP-9846' into maint
* pan/win_doc_fix/OTP-9846:
Correct build instruction for 32bit OpenSSL
Diffstat (limited to 'INSTALL-WIN32.md')
-rw-r--r-- | INSTALL-WIN32.md | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/INSTALL-WIN32.md b/INSTALL-WIN32.md index 1e5e1f45fa..93b7e3a1e1 100644 --- a/INSTALL-WIN32.md +++ b/INSTALL-WIN32.md @@ -600,32 +600,36 @@ OpenSSL. Well' here's the list: Windows command prompt (it should be on the same drive as where you are going to install it if everything is to work smothly). - `C:\> cd <some dir>` + C:\> cd <some dir> Add ActiveState (or some other windows perl, not cygwins) to your PATH: - `C:\...\> set PATH=C:\Perl\bin;%PATH%` + C:\...\> set PATH=C:\Perl\bin;%PATH% + + Or if you installed the 64bit perl: + + C:\...\> set PATH=C:\Perl64\bin;%PATH% Configure OpenSSL for 32 bit: - `C:\...\> perl Configure VC-WIN32 --prefix=/OpenSSL` + C:\...\> perl Configure VC-WIN32 --prefix=/OpenSSL Or for 64 bit: - `C:\...\> perl Configure VC-WIN64A --prefix=/OpenSSL-Win64` + C:\...\> perl Configure VC-WIN64A --prefix=/OpenSSL-Win64 Do some setup (for 32 bit): - `C:\...\> ms\do_win32` + C:\...\> ms\do_ms The same for 64 bit: - `C:\...\> ms\do_win64a` + C:\...\> ms\do_win64a Then build static libraries and install: - `C:\...\> nmake -f ms\nt.mak` - `C:\...\> nmake -f ms\nt.mak install` + C:\...\> nmake -f ms\nt.mak + C:\...\> nmake -f ms\nt.mak install That's it - you now have your perfectly consistent static build of openssl. If you want to get rid of any possibly patented @@ -644,19 +648,21 @@ OpenSSL. Well' here's the list: edit: `C:\cygwin\opt\local\pgm\wxMSW-2.8.11\include\wx\msw\setup.h` enable `wxUSE_GLCANVAS`, `wxUSE_POSTSCRIPT` and `wxUSE_GRAPHICS_CONTEXT` - build: From a command prompt with the VC tools available (usually started from a - shortcut installed by the SDK/Visual Studio): + build: From a command prompt with the VC tools available (See the + instructions for OpenSSL build above for help on starting the + proper command prompt in RELEASE mode): - `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw` - `nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc` - `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc` - `nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc` + C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw + C:\...\> nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc + C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc + C:\...\> nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc Or - if building a 64bit version: - `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw` - `nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc` - `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc` - `nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc` + + C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw + C:\...\> nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc + C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc + C:\...\> nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc * The Erlang source distribution (from <http://www.erlang.org/download.html>). The same as for Unix platforms. Preferably use tar from within Cygwin to |