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 71cb6946ec7f267755245f657e97fd4c277a0016..751281f9defa0d00ffbecf6c7d31079c615b8f18 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -38,10 +38,16 @@
             next;
         }
 
             next;
         }
 

-        my $isOle = $wxMSW{$file} =~ /\bO\b/;
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;

         $file =~ s/cp?p?$/obj/;
         $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 .= $_ . ": ";
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";

+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }

         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }