提交 71a16946 编写于 作者: D Dr. Stephen Henson

Fix WIN32 build.

Make assembly language handling conditional on the "copy" platform
as Windows does its own thing here.
上级 5702e965
...@@ -875,15 +875,17 @@ sub fix_asm ...@@ -875,15 +875,17 @@ sub fix_asm
return $asm . ' '; return $asm . ' ';
} }
$lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5'); if ($orig_platform eq 'copy') {
$lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn'); $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
$lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto'); $lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
# AES asm files end up included by the aes dir itself $lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
#$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes'); # AES asm files end up included by the aes dir itself
$lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha'); #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines'); $lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha');
$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4'); $lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes'); $lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
}
foreach (values %lib_nam) foreach (values %lib_nam)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册