harmonize with 0.9.7-stable and 0.9.8-stable variants of CHANGES

[openssl.git] / util / pl / VC-32.pl

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index d2ec04eac177a60825a5e5a2041fa8d06605513a..938aff65f2fcdca69b2a7d6afcf0c02620ff5175 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -26,20 +26,69 @@ if ($FLAVOR =~ /WIN64/)
     # considered safe to ignore.
     # 
     $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
     $opt_cflags=' /MD /Ox';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /subsystem:console /opt:ref";
     }
 elsif ($FLAVOR =~ /CE/)
     {
-    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
-    $opt_cflags=' /MD /Ox /O2 /Ob2';
-    $dbg_clfags=' /MDd /Od -DDEBUG -D_DEBUG';
-    $lflags='/nologo /subsystem:windowsce,$(WCELDVERSION) /machine:$(WCELDMACHINE) /opt:ref';
+    # sanity check
+    die '%OSVERSION% is not defined'   if (!defined($ENV{'OSVERSION'}));
+    die '%PLATFORM% is not defined'    if (!defined($ENV{'PLATFORM'}));
+    die '%TARGETCPU% is not defined'   if (!defined($ENV{'TARGETCPU'}));
+
+    #
+    # Idea behind this is to mimic flags set by eVC++ IDE...
+    #
+    $wcevers = $ENV{'OSVERSION'};                      # WCENNN
+    die '%OSVERSION% value is insane'  if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
+    $wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2";   # -D_WIN32_WCE=NNN
+    $wcelflag = "/subsystem:windowsce,$1.$2";          # ...,N.NN
+
+    $wceplatf =  $ENV{'PLATFORM'};
+    $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
+    $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
+
+    $wcetgt = $ENV{'TARGETCPU'};       # just shorter name...
+    SWITCH: for($wcetgt) {
+       /^X86/          && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
+                               $wcelflag.=" /machine:IX86";    last; };
+       /^ARMV4[IT]/    && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                               $wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
+                               $wcecdefs.=" -QRarch4T -QRinterwork-return";
+                               $wcelflag.=" /machine:THUMB";   last; };
+       /^ARM/          && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
+                               $wcelflag.=" /machine:ARM";     last; };
+       /^MIPSIV/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -D_MIPS64 -QMmips4 -QMn32";
+                               $wcelflag.=" /machine:MIPSFPU"; last; };
+       /^MIPS16/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -DMIPSII -QMmips16";
+                               $wcelflag.=" /machine:MIPS16";  last; };
+       /^MIPSII/       && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
+                               $wcecdefs.=" -QMmips2";
+                               $wcelflag.=" /machine:MIPS";    last; };
+       /^R4[0-9]{3}/   && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000";
+                               $wcelflag.=" /machine:MIPS";    last; };
+       /^SH[0-9]/      && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx";
+                               $wcecdefs.=" -Qsh4" if ($wcetgt =~ /^SH4/);
+                               $wcelflag.=" /machine:$wcetgt"; last; };
+       { $wcecdefs.=" -D$wcetgt -D_$wcetgt_";
+         $wcelflag.=" /machine:$wcetgt";                       last; };
+    }
+
+    $cc='$(CC)';
+    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
+    $base_cflags.=" $wcecdefs";
+    $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
+    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
+    $lflags="/nologo /opt:ref $wcelflag";
     }
 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
     $opt_cflags=' /MD /Ox /O2 /Ob2';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
     $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
@@ -74,7 +123,10 @@ elsif ($FLAVOR =~ /CE/)     { $ex_libs='winsock.lib'; }
 else                   { $ex_libs='wsock32.lib'; }
 
 if ($FLAVOR =~ /CE/)
-       { $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib $(WCELDFLAGS)'; }
+       {
+       $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib';
+       $ex_libs.=' /nodefaultlib:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
+       }
 else
        {
        $ex_libs.=' gdi32.lib advapi32.lib user32.lib';