more fixes for Borland and OLE files

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

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;
         }
 
-        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";
     }

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 38e4cbe7a091a475cc737df3ac75e8c3224da4fa..de6c532ec1ad879b03586d35d837186dd926310d 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:27, 1999/07/26
+# This file was automatically generated by tmake at 15:27, 1999/07/26
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -204,7 +204,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\curico.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
-               $(OLEDIR)\dataobj.obj \
+               $(MSWDIR)\dataobj.obj \
                $(MSWDIR)\dc.obj \
                $(MSWDIR)\dcclient.obj \
                $(MSWDIR)\dcmemory.obj \
@@ -216,8 +216,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dibutils.obj \
                $(MSWDIR)\dirdlg.obj \
                $(MSWDIR)\dragimag.obj \
-               $(OLEDIR)\dropsrc.obj \
-               $(OLEDIR)\droptgt.obj \
+               $(MSWDIR)\dropsrc.obj \
+               $(MSWDIR)\droptgt.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -239,7 +239,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\notebook.obj \
-               $(OLEDIR)\oleutils.obj \
+               $(MSWDIR)\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
@@ -271,7 +271,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
-               $(OLEDIR)\uuid.obj \
+               $(MSWDIR)\uuid.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj \
                $(MSWDIR)\xpmhand.obj
@@ -361,7 +361,7 @@ $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(OLEDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
+$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
 
 $(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
@@ -385,9 +385,9 @@ $(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
 $(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
-$(OLEDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
+$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
-$(OLEDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
+$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
@@ -431,7 +431,7 @@ $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
 $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
 
-$(OLEDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
+$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
@@ -495,7 +495,7 @@ $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(OLEDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)