Commit e1b81fed authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Make it possible to link VC static lib with either /MT or /MD application. 

PR: 1230
parent 5d58f1bb

util/pl/VC-32.pl

+6 −4
Original line number Diff line number Diff line
@@ -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='';