more fixes for Borland and OLE files

[wxWidgets.git] / distrib / msw / tmake / b32.t

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index c28d56b09a9eb070e56e26d8d9d7e265ab05b5c5..751281f9defa0d00ffbecf6c7d31079c615b8f18 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -32,16 +32,22 @@
     foreach $file (sort keys %wxMSW) {
         next if $wxMSW{$file} =~ /\b16\b/;
 
-        if ( file =~ /automtn/ ) {
+        if ( $file =~ /^automtn/ ) {
             #! comment in old makefile.b32 seems to imply that this file can't
             #! be compiled with Borland (leads to crash in oleauto sample)
             next;
         }
 
-        my $isOle = $wxMSW{$file} =~ /\bO\b/;
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= ($isOle ? "\$(OLEDIR)\\" : "\$(MSWDIR)\\")
-                                 . $file . " "
+        my $obj = "\$(MSWDIR)\\" . $file . " ";
+
+        $project{"WXMSWOBJS"} .= $obj;
+        if ( $isOleObj ) {
+            #! remember that this file is in ole subdir
+            $project{"WXOLEOBJS"} .= $obj;
+        }
+
     }
 #$}
 
@@ -194,6 +200,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }