diff options
| author | Andy Polyakov <appro@openssl.org> | 2007-10-07 12:55:36 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2007-10-07 12:55:36 +0000 |
| commit | e1b81fed3390122dfe173777cf330905c8cef3e1 (patch) | |
| tree | 8254837922088bd14d764d7060ce16216117521e /util | |
| parent | 5d58f1bbfe23fe990293ecd209d1a8336c423a62 (diff) | |
| download | openssl-e1b81fed3390122dfe173777cf330905c8cef3e1.zip openssl-e1b81fed3390122dfe173777cf330905c8cef3e1.tar.gz openssl-e1b81fed3390122dfe173777cf330905c8cef3e1.tar.bz2 | |
Make it possible to link VC static lib with either /MT or /MD application.
PR: 1230
Diffstat (limited to 'util')
| -rw-r--r-- | util/pl/VC-32.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 0043983..ae2efe2 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -31,8 +31,9 @@ if ($FLAVOR =~ /WIN64/) $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE'; $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 - $opt_cflags=' /MD /Ox'; - $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; + my $f = $shlib?' /MD':' /Zl /MT'; + $opt_cflags=$f.' /Ox'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; } elsif ($FLAVOR =~ /CE/) @@ -96,8 +97,9 @@ else # Win32 $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 - $opt_cflags=' /MD /Ox /O2 /Ob2'; - $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; + my $f = $shlib?' /MD':' /Zl /MT'; + $opt_cflags=$f.' /Ox /O2 /Ob2'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; } $mlflags=''; |