From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 3 Jan 2002 23:08:41 +0000 (+0000)
Subject: (Hopefully) fixed bad MSW makefiles (Vadim, can you please check if I haven't screw... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6a253da1fbe80462be743a58513fccd4c75dac0b?ds=sidebyside

(Hopefully) fixed bad MSW makefiles (Vadim, can you please check if I haven't screw up something in that executable noise?)


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 cf27dc87c4..0a2ba906fd 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -29,6 +29,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
         $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 14f7cb15c4..05904e5d25 100644
--- 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
-        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\./;
diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 15b3cb1930..dd1f6ac7f9 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -24,7 +24,7 @@
     }
 
     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\./;
diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t
index 1f903c4cf6..0d86ddddac 100644
--- a/distrib/msw/tmake/msw.t
+++ b/distrib/msw/tmake/msw.t
@@ -25,7 +25,7 @@
     }
 
     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/;
 
diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index ca6a040705..745d8980c3 100644
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -27,6 +27,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
     }
diff --git a/distrib/msw/tmake/v15.t b/distrib/msw/tmake/v15.t
index e01a925e28..68ab24f24f 100644
--- 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
-        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/;
diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 045b008e30..dae53610b5 100644
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -37,6 +37,8 @@
     }
 
     foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";