mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
Make CC,CFLAG etc get passed to make links and various Win32 fixes.
This commit is contained in:
parent
e476f4256a
commit
83ec54b40d
5
CHANGES
5
CHANGES
@ -5,6 +5,11 @@
|
||||
|
||||
Changes between 0.9.1c and 0.9.2
|
||||
|
||||
*) Fix Makefile.org so CC,CFLAG etc are passed to 'make links' add
|
||||
advapi32.lib to Win32 build and change the pem test comparision
|
||||
to fc.exe (thanks to Ulrich Kroener <kroneru@yahoo.com> for the
|
||||
suggestion).
|
||||
|
||||
*) DES quad checksum was broken on big-endian architectures. Fixed.
|
||||
[Ben Laurie]
|
||||
|
||||
|
@ -48,7 +48,7 @@ perl util\mkdef.pl crypto ssl update
|
||||
|
||||
then ms\do_ms should not give a warning any more. However the numbers that get
|
||||
assigned by this technique may not match those that eventually get assigned
|
||||
in the CVS tree: so you anything linked against this version of the library
|
||||
in the CVS tree: so anything linked against this version of the library
|
||||
may need to be recompiled.
|
||||
|
||||
If you get errors about unresolved externals then this means that either you
|
||||
@ -86,8 +86,7 @@ to make a debugging version of the library.
|
||||
|
||||
If you want to enable the NT specific features of OpenSSL (currently only
|
||||
the logging BIO) follow the instructions above but call the batch file
|
||||
do_nt.bat instead of do_ms.bat. If you do this then you will no longer be able
|
||||
to run the OpenSSL binaries under Windows 95 or 98.
|
||||
do_nt.bat instead of do_ms.bat.
|
||||
|
||||
You can also build a static version of the library using the Makefile ms\nt.mak
|
||||
|
||||
|
@ -238,7 +238,7 @@ links:
|
||||
@$(TOP)/util/mklink.sh include $(EXHEADER)
|
||||
@for i in $(DIRS); do \
|
||||
(cd $$i && echo "making links in $$i..." && \
|
||||
$(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
|
||||
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \
|
||||
done;
|
||||
@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
echo=off
|
||||
set ssleay=%1%
|
||||
set tmp1=pem.out
|
||||
set cmp=perl ..\ms\cmp.pl
|
||||
set cmp=fc.exe
|
||||
|
||||
call tpem.bat crl ..\test\testcrl.pem
|
||||
if errorlevel 1 goto err
|
||||
|
@ -113,7 +113,7 @@ sub do_lib_rule
|
||||
else
|
||||
{
|
||||
local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
|
||||
$ex.=' wsock32.lib gdi32.lib';
|
||||
$ex.=' wsock32.lib gdi32.lib advapi32.lib';
|
||||
$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
|
||||
}
|
||||
$ret.="\n";
|
||||
|
Loading…
Reference in New Issue
Block a user