Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for C files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-24 22:17:19 +00:00
parent 53f69f7a04
commit 9f3553c83e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/msw/tmake/b32.t
View File

@@ -24,8 +24,11 @@
} }
foreach $file (sort keys %wxCommon) { foreach $file (sort keys %wxCommon) {
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/; $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) { foreach $file (sort keys %wxMSW) {
@@ -204,8 +207,9 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/MSWDIR/COMMDIR/; s/MSWDIR/COMMDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/$suffix/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
#$} #$}

6
src/msw/makefile.b32
View File

@@ -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! # 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)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
$(MSWDIR)\extended.obj: $(COMMDIR)\extended.$(SRCSUFF) $(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF) $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
@@ -640,7 +640,7 @@ $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(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) $(MSWDIR)\url.obj: $(COMMDIR)\url.$(SRCSUFF)