From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Oct 1999 23:00:30 +0000 (+0000)
Subject: Borland makefiles fixes for .c files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/83b1f3539561969b7461243e77fc684887718a6e?ds=inline

Borland makefiles fixes for .c files


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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 3fb5fd74c9..ffbf12197c 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -38,6 +38,8 @@
             next;
         }
 
+        $isCFile = $file =~ /\.c$/;
+
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         $file =~ s/cp?p?$/obj/;
         my $obj = "\$(MSWDIR)\\" . $file . " ";
@@ -47,7 +49,7 @@
             #! remember that this file is in ole subdir
             $project{"WXOLEOBJS"} .= $obj;
         }
-
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
 
@@ -201,7 +203,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
-        s/obj$/\$(SRCSUFF)/;
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 615e6e7abe..e8ad7db29d 100644
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -42,8 +42,11 @@
         #! don't take files not appropriate for 16-bit Windows
         next if $wxMSW{$file} =~ /\b(32|O)\b/;
 
+        $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXMSWOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
 
@@ -162,7 +165,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
-        s/obj/\$(SRCSUFF)/;
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9ad8a4a539..b13d2e9459 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 00:54, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -413,7 +413,7 @@ $(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF)
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 5a881e60d9..221354d244 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 00:58, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -345,7 +345,7 @@ $(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
 
-$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF)
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)