wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update from 1.0.0-stable branch.

Browse source
This commit is contained in:
Dr. Stephen Henson 2009-05-06 16:55:55 +00:00
parent 7da74281d2
commit 71b7858b1d
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configure
View file

@ -490,6 +490,7 @@ my %table=(
# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
# Unified CE target
"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
# Borland C++ 4.5
@ -572,7 +573,7 @@ my %table=(
);
my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
VC-NT VC-CE VC-WIN32
VC-NT VC-CE VC-WIN32 debug-VC-WIN32
BC-32
netware-clib netware-clib-bsdsock
netware-libc netware-libc-bsdsock);

16
INSTALL.W32
View file

@ -41,7 +41,7 @@
C++, then you will need already mentioned Netwide Assembler binary,
nasmw.exe or nasm.exe, to be available on your %PATH%.
Firstly you should run Configure:
Firstly you should run Configure with platorm VC-WIN32:
> perl Configure VC-WIN32 --prefix=c:\some\openssl\dir
@ -81,16 +81,13 @@
There are various changes you can make to the Win32 compile
environment. By default the library is not compiled with debugging
symbols. If you add 'debug' to the mk1mf.pl lines in the do_* batch
file then debugging symbols will be compiled in. Note that mk1mf.pl
expects the platform to be the last argument on the command line, so
'debug' must appear before that, as all other options.
symbols. If you use the platform debug-VC-WIN32 instead of VC-WIN32
then debugging symbols will be compiled in.
By default in 0.9.8 OpenSSL will compile builtin ENGINES into the
libeay32.dll shared library. If you specify the "no-static-engine"
By default in 1.0.0 OpenSSL will compile builtin ENGINES into the
separate shared librariesy. If you specify the "enable-static-engine"
option on the command line to Configure the shared library build
(ms\ntdll.mak) will compile the engines as separate DLLs.
(ms\ntdll.mak) will compile the engines into libeay32.dll instead.
The default Win32 environment is to leave out any Windows NT specific
features.
@ -103,7 +100,6 @@
ms\nt.mak
Borland C++ builder 5
---------------------

2
util/mk1mf.pl
View file

@ -54,6 +54,8 @@ while(<IN>) {
}
close(IN);
$debug = 1 if $mf_platform =~ /^debug-/;
die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
$infile="MINFO";