From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Jul 1999 22:17:19 +0000 (+0000)
Subject: fix for C files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9f3553c83ee10aaae4052307a0c2cb909c7976a4

fix for C files


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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 9bf8f45b09..fafa2fc940 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -24,8 +24,11 @@
     }
 
     foreach $file (sort keys %wxCommon) {
+        $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXCOMMONOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 
     foreach $file (sort keys %wxMSW) {
@@ -204,8 +207,9 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/MSWDIR/COMMDIR/;
-        s/obj$/\$(SRCSUFF)/;
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index b4f3439cca..d896898c67 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:25, 1999/07/23
+# This file was automatically generated by tmake at 00:16, 1999/07/25
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -538,7 +538,7 @@ $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
-$(MSWDIR)\extended.obj: $(COMMDIR)\extended.$(SRCSUFF)
+$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
 $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
@@ -640,7 +640,7 @@ $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
-$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.$(SRCSUFF)
+$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
 
 $(MSWDIR)\url.obj: $(COMMDIR)\url.$(SRCSUFF)