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

Borland makefiles fixes for .c files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-01 23:00:30 +00:00
parent 7cc391bd39
commit 83b1f35395
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,8 @@
next; next;
} }
$isCFile = $file =~ /\.c$/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/; my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
my $obj = "\$(MSWDIR)\\" . $file . " "; my $obj = "\$(MSWDIR)\\" . $file . " ";
@@ -47,7 +49,7 @@
#! remember that this file is in ole subdir #! remember that this file is in ole subdir
$project{"WXOLEOBJS"} .= $obj; $project{"WXOLEOBJS"} .= $obj;
} }
$project{"WXCOBJS"} .= $obj if $isCFile;
} }
#$} #$}
@@ -201,7 +203,8 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; } if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
s/obj$/\$(SRCSUFF)/; $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj$/$suffix/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
#$} #$}

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

@@ -42,8 +42,11 @@
#! don't take files not appropriate for 16-bit Windows #! don't take files not appropriate for 16-bit Windows
next if $wxMSW{$file} =~ /\b(32|O)\b/; next if $wxMSW{$file} =~ /\b(32|O)\b/;
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/; $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; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/obj/\$(SRCSUFF)/; $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj/$suffix/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
#$} #$}

4
src/msw/makefile.b32
View File

@@ -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! # 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)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF) $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)

4
src/msw/makefile.bcc
View File

@@ -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! # 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)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF) $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)