OpenSSL: openssl/util/pl/ VC-32.pl

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
07-Oct-2007 14:55:36
  Branch: HEAD                             Handle:
2007100713553600

  Modified files:
    openssl/util/pl         VC-32.pl

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

  Summary:
    Revision    Changes     Path
    1.46        +6  -4      openssl/util/pl/VC-32.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/util/pl/VC-32.pl
 
============================================================
================
  $ cvs diff -u -r1.45 -r1.46 VC-32.pl
  --- openssl/util/pl/VC-32.pl	12 Aug 2007 23:59:05
-0000	1.45
  +++ openssl/util/pl/VC-32.pl	7 Oct 2007 12:55:36
-0000	1.46
   -31,8 +31,9 
       $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 
       $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='';
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org