(Hopefully) fixed bad MSW makefiles (Vadim, can you please check if I haven't screw...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index cf27dc87c432e41f3bffb71fe90587e8f90e73ab..0a2ba906fd33f87f4f208071135b5d982d2d5288 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -29,6 +29,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+

         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $obj = "\$(MSWDIR)\\" . $file . " ";
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $obj = "\$(MSWDIR)\\" . $file . " ";

diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 14f7cb15c4b28fa9f708e00797823674950e6852..05904e5d25d2dcacfed64ca6685ca5fdc1342f6d 100644 (file)
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -31,7 +31,7 @@
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently

-        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+        next if $wxCommon{$file} =~ /\b(32|S|U)\b/;

 
         #! needs extra files (sql*.h) so not compiled by default.
         next if $file =~ /^odbc\./;
 
         #! needs extra files (sql*.h) so not compiled by default.
         next if $file =~ /^odbc\./;

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 15b3cb19301a5b2380c89f929a9d3e61519d5a6b..dd1f6ac7f935ce88b30dd9daa48c1261ed2f171e 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -24,7 +24,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

-        next if $wxCommon{$file} =~ /\b(16)\b/;
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;

 
         #! needs extra files (sql*.h) so not compiled by default.
         #! next if $file =~ /^odbc\./;
 
         #! needs extra files (sql*.h) so not compiled by default.
         #! next if $file =~ /^odbc\./;

diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t
index 1f903c4cf623494fc24bb4dd8ae20832d8ccbcc2..0d86ddddac52268d4de07e195e206b2e18fe06e2 100644 (file)
--- a/distrib/msw/tmake/msw.t
+++ b/distrib/msw/tmake/msw.t
@@ -25,7 +25,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxCommon{$file} =~ /\b(R|U|16)\b/;

 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index ca6a04070573348e868d1cfbaf860b0dc970ba50..745d8980c3d8b49b8278f96b698f7b8c9739933d 100644 (file)
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -27,6 +27,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+

         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
     }
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
     }

diff --git a/distrib/msw/tmake/v15.t b/distrib/msw/tmake/v15.t
index e01a925e28b7fc0a603fac482dc902d2aa150c4b..68ab24f24f3cc65d805b9f6813213dbb13c3d57e 100644 (file)
--- a/distrib/msw/tmake/v15.t
+++ b/distrib/msw/tmake/v15.t
@@ -29,7 +29,7 @@
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently

-        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+        next if $wxCommon{$file} =~ /\b(32|S|U)\b/;

 
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
 
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 045b008e30a89faa7a206949582f2432480ea336..dae53610b5af28d9569130385965296898a6e584 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -37,6 +37,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+

         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";