X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b9315eb77090dbef647c0ef638df43b761767aa..a97d569cbbf90ba8bb293214055c3a8c19d447b5:/distrib/msw/tmake/bcc.t diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t index 615e6e7abe..4db2cffd9b 100644 --- a/distrib/msw/tmake/bcc.t +++ b/distrib/msw/tmake/bcc.t @@ -2,6 +2,11 @@ #! File: bcc.t #! Purpose: tmake template file from which makefile.bcc is generated by running #! tmake -t bcc wxwin.pro -o makefile.bcc +#! +#! TODO: +#! - resourc2.obj is not correctly generated (see list and target). +#! - cpp is incorrectly substituted into filenames containing 'obj' +#! #! Author: Vadim Zeitlin #! Created: 14.07.99 #! Version: $Id$ @@ -15,7 +20,10 @@ #! now transform these hashes into $project tags foreach $file (sort keys %wxGeneric) { my $tag = ""; - next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/; + if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) { + #! Need this file too since it has wxGenericPageSetupDialog + next unless $file =~ /^prntdlgg\./; + } $file =~ s/cp?p?$/obj/; $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " " @@ -23,7 +31,7 @@ foreach $file (sort keys %wxCommon) { #! socket files don't compile under Win16 currently - next if $wxCommon{$file} =~ /\b(32|S)\b/; + next if $wxCommon{$file} =~ /\b(32|S|U)\b/; #! needs extra files (sql*.h) so not compiled by default. next if $file =~ /^odbc\./; @@ -36,18 +44,21 @@ } #! special hack for Borland in 16 bits needs this file - $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.cpp'; + $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.obj'; foreach $file (sort keys %wxMSW) { #! 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; } #$} -# This file was automatically generated by tmake at #$ Now() +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -55,7 +66,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright:(c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # @@ -87,20 +98,13 @@ THISDIR = $(WXDIR)\src\msw # Please set these according to the settings in wx_setup.h, so we can include # the appropriate libraries in wx.lib USE_CTL3D=1 -USE_XPM_IN_MSW=0 PERIPH_LIBS= PERIPH_TARGET= PERIPH_CLEAN_TARGET= !if "$(USE_CTL3D)" == "1" -PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS) -!endif - -!if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS) -PERIPH_TARGET=xpm $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) +PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS) !endif # TODO: add these libraries @@ -123,7 +127,6 @@ DOCDIR = $(WXDIR)\docs GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); @@ -136,25 +139,16 @@ wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS) erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! -+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) + tlib $(LIBTARGET) /P2048 @&&! ++$(COMMONOBJS:.obj =.obj +)\ ++$(GENERICOBJS:.obj =.obj +)\ ++$(MSWOBJS:.obj =.obj +)\ ++$(PERIPH_LIBS:.lib =.lib +) ! dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - # $(OBJECTS): $(WXDIR)\include\wx\setup.h #${ @@ -162,7 +156,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"; } #$} @@ -177,7 +172,7 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c $text .= $_ . ": "; $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; s/MSWDIR/COMMDIR/; - s/obj/$suffix/; + s/obj$/$suffix/; $text .= $_ . "\n\n"; } #$} @@ -192,7 +187,7 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c foreach (@objs) { $text .= $_ . ": "; s/MSWDIR/GENDIR/; - s/obj/\$(SRCSUFF)/; + s/obj$/\$(SRCSUFF)/; $text .= $_ . "\n\n"; } #$} @@ -212,26 +207,7 @@ all_execs: make -f makefile.bcc all_execs cd $(WXDIR)\src\msw -all_libs: - cd $(WXDIR)\src\msw - make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\ - wxstring wxtree mfutils # wxxpm - -all_contribs: - cd $(WXDIR)\src\msw - make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm - # CONTRIB -ctl3d: $(CFG) - cd $(WXDIR)\src\msw\ctl3d\borland - make -f makefile.bcc -DCFG=$(CFG) - cd $(WXDIR)\src\msw - -wxxpm: $(CFG) - cd $(WXDIR)\src\xpm - make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG) - cd $(WXDIR)\src\msw - png: $(CFG) cd $(WXDIR)\src\png make -f makefile.bcc @@ -269,7 +245,7 @@ $(CFG): makefile.bcc -Fs- -Vf -Ff=4 --I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib -I$(WXDIR)\include\wx\msw\gnuwin32 -L$(BCCDIR)\lib -D__WXWIN__ @@ -295,8 +271,6 @@ clean: $(PERIPH_CLEAN_TARGET) erase *.pch erase *.csm erase *.cfg - erase ..\common\y_tab.c - erase ..\common\lex_yy.c cleanall: clean