From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Oct 1999 07:22:06 +0000 (+0000)
Subject: Symantec makefile fixes (for OLE files)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c54f5226220ea48997f161e53728d7071245a59d

Symantec makefile fixes (for OLE files)


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

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index eca10fb8f7..faecf5740b 100644
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -37,8 +37,11 @@
 
         next if $wxGeneric{$file} =~ /\b16\b/;
 
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= '$(MSWDIR)\\' . $file . " "
+        $project{"WXMSWOBJS"} .= '$(MSWDIR)\\';
+        $project{"WXMSWOBJS"} .= 'ole\\' if $isOleObj;
+        $project{"WXMSWOBJS"} .= $file . " "
     }
 #$}
 
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 0c58317cb1..cd285f4501 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:37, 1999/10/22
+# This file was automatically generated by tmake at 09:21, 1999/10/25
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -160,7 +160,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
-		$(MSWDIR)\dataobj.obj \
+		$(MSWDIR)\ole\dataobj.obj \
 		$(MSWDIR)\dc.obj \
 		$(MSWDIR)\dcclient.obj \
 		$(MSWDIR)\dcmemory.obj \