fixes for PS and OLE files for Borland makefiles

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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index fafa2fc940fe289d1c6415d24f0a08ab1febaec2..c28d56b09a9eb070e56e26d8d9d7e265ab05b5c5 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -15,9 +15,7 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";
-        if ( $wxGeneric{$file} =~ /\b(G|16|U)\b/ ) {
-            next;
-        }
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
@@ -40,8 +38,10 @@
             next;
         }
 
+        my $isOle = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $project{"WXMSWOBJS"} .= ($isOle ? "\$(OLEDIR)\\" : "\$(MSWDIR)\\")
+                                 . $file . " "
     }
 #$}
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index d896898c67b691bde553c0ac82e26df3d7e7b100..967e81288b859bca75b5c6d5b0762dd7fc498842 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:16, 1999/07/25
+# This file was automatically generated by tmake at 23:28, 1999/07/25
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -83,7 +83,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
-               $(MSWDIR)\printps.obj \
                $(MSWDIR)\progdlgg.obj \
                $(MSWDIR)\prop.obj \
                $(MSWDIR)\propform.obj \
@@ -189,7 +188,7 @@ COMMONOBJS = \
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
-               $(MSWDIR)\automtn.obj \
+               $(OLEDIR)\automtn.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -206,7 +205,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\curico.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
-               $(MSWDIR)\dataobj.obj \
+               $(OLEDIR)\dataobj.obj \
                $(MSWDIR)\dc.obj \
                $(MSWDIR)\dcclient.obj \
                $(MSWDIR)\dcmemory.obj \
@@ -218,8 +217,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dibutils.obj \
                $(MSWDIR)\dirdlg.obj \
                $(MSWDIR)\dragimag.obj \
-               $(MSWDIR)\dropsrc.obj \
-               $(MSWDIR)\droptgt.obj \
+               $(OLEDIR)\dropsrc.obj \
+               $(OLEDIR)\droptgt.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -241,7 +240,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\notebook.obj \
-               $(MSWDIR)\oleutils.obj \
+               $(OLEDIR)\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
@@ -273,7 +272,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
-               $(MSWDIR)\uuid.obj \
+               $(OLEDIR)\uuid.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj \
                $(MSWDIR)\xpmhand.obj
@@ -331,7 +330,7 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
-$(MSWDIR)\automtn.obj: $(MSWDIR)\automtn.$(SRCSUFF)
+$(OLEDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
 
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
@@ -365,7 +364,7 @@ $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(MSWDIR)\dataobj.obj: $(MSWDIR)\dataobj.$(SRCSUFF)
+$(OLEDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
 
 $(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
@@ -389,9 +388,9 @@ $(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
 $(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
-$(MSWDIR)\dropsrc.obj: $(MSWDIR)\dropsrc.$(SRCSUFF)
+$(OLEDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
-$(MSWDIR)\droptgt.obj: $(MSWDIR)\droptgt.$(SRCSUFF)
+$(OLEDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
@@ -435,7 +434,7 @@ $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
 $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
 
-$(MSWDIR)\oleutils.obj: $(MSWDIR)\oleutils.$(SRCSUFF)
+$(OLEDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
@@ -499,7 +498,7 @@ $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(MSWDIR)\uuid.obj: $(MSWDIR)\uuid.$(SRCSUFF)
+$(OLEDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
@@ -686,8 +685,6 @@ $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
-
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
 $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)