aboutsummaryrefslogtreecommitdiff
path: root/openssl/util/pl
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/util/pl')
-rw-r--r--openssl/util/pl/VC-32.pl13
1 files changed, 9 insertions, 4 deletions
diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl
index 45013475d..c024f0268 100644
--- a/openssl/util/pl/VC-32.pl
+++ b/openssl/util/pl/VC-32.pl
@@ -114,10 +114,11 @@ elsif ($FLAVOR =~ /CE/)
else # Win32
{
$base_cflags= " $mf_cflag";
- my $f = $shlib?' /MD':' /MT';
+
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+ $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot';
+ $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Zi';
$lflags="/nologo /subsystem:console /opt:ref";
}
$mlflags='';
@@ -135,6 +136,7 @@ if ($debug)
else
{
$cflags=$opt_cflags.$base_cflags;
+ $cdflags=$dbg_cflags.$base_cflags;
}
$obj='.obj';
@@ -165,6 +167,7 @@ else
$ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);
}
+ $cdflags.=" -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE";
# static library stuff
$mklib='lib /nologo';
$ranlib='';
@@ -225,6 +228,7 @@ if (!$no_asm)
win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src);
win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src);
$perl_asm = 1;
+ $cdflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
}
if ($shlib && $FLAVOR !~ /CE/)
@@ -267,7 +271,8 @@ elsif ($shlib && $FLAVOR =~ /CE/)
$tmp_def='tmp32dll_$(TARGETCPU)';
}
-$cflags.=" /Fd$out_def";
+$cflags.=" /Fd\$(OUT_D)";
+$cdflags.=" /Fd\$(OUT_D)";
sub do_lib_rule
{