X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b73db3c34aefd98080b425459322fa821ae271f..755c41bf1ebddab912a4bfbe460041fec28aea07:/distrib/msw/tmake/bcc.t diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t index 97b91352a0..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"; } #$} @@ -234,7 +238,7 @@ wxxpm: $(CFG) png: $(CFG) cd $(WXDIR)\src\png - make -f makefile.bcc + make -f makefile.bcc cd $(WXDIR)\src\msw clean_png: @@ -301,3 +305,11 @@ clean: $(PERIPH_CLEAN_TARGET) cleanall: clean +MFTYPE=bcc +# Can't use this or we'll have to distribute all tmake files with wxWindows +#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t + +self: + cd $(WXWIN)\distrib\msw\tmake + tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) + copy makefile.$(MFTYPE) $(WXWIN)\src\msw