X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2071dda0b6016afed8777a4dd23f0ada537026b..a9775f1f58c58c763953d411c473bc2ee73051fb:/distrib/msw/tmake/bcc.t?ds=sidebyside diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t index b3c3ffe111..3a3659ff20 100644 --- a/distrib/msw/tmake/bcc.t +++ b/distrib/msw/tmake/bcc.t @@ -28,8 +28,11 @@ #! needs extra files (sql*.h) so not compiled by default. next if $file =~ /^odbc\./; + $isCFile = $file =~ /\.c$/; $file =~ s/cp?p?$/obj/; - $project{"WXCOMMONOBJS"} .= "\$(MSWDIR)\\" . $file . " " + $obj = "\$(MSWDIR)\\" . $file . " "; + $project{"WXCOMMONOBJS"} .= $obj; + $project{"WXCOBJS"} .= $obj if $isCFile; } #! special hack for Borland in 16 bits needs this file @@ -172,8 +175,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"; } #$} @@ -230,7 +234,7 @@ wxxpm: $(CFG) png: $(CFG) cd $(WXDIR)\src\png - make -f makefile.bcc + make -f makefile.bcc cd $(WXDIR)\src\msw clean_png: @@ -297,3 +301,8 @@ clean: $(PERIPH_CLEAN_TARGET) cleanall: clean +MFTYPE=bcc +makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t + cd $(WXWIN)\distrib\msw\tmake + tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) + copy makefile.$(MFTYPE) $(WXWIN)\src\msw