X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9d61c23a836b4e4f76d117d18d6b9848b915c39..b86e511a9bde666590061c8f74d5fed150442c83:/distrib/msw/tmake/b32.t?ds=sidebyside diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index 71cb6946ec..37f85b10dc 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -21,6 +21,13 @@ $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " " } + foreach $file (sort keys %wxHTML) { + next if $wxHTML{$file} =~ /\b16\b/; + + $file =~ s/cp?p?$/obj/; + $project{"WXHTMLOBJS"} .= "\$(MSWDIR)\\" . $file . " " + } + foreach $file (sort keys %wxCommon) { $isCFile = $file =~ /\.c$/; $file =~ s/cp?p?$/obj/; @@ -32,16 +39,25 @@ foreach $file (sort keys %wxMSW) { next if $wxMSW{$file} =~ /\b16\b/; - if ( $file =~ /^automtn/ ) { - #! comment in old makefile.b32 seems to imply that this file can't - #! be compiled with Borland (leads to crash in oleauto sample) - next; - } +#! if ( $file =~ /^automtn/ ) { +#! #! comment in old makefile.b32 seems to imply that this file can not +#! #! be compiled with Borland (leads to crash in oleauto sample) +#! No longer true, at least for BC++ 5.2 +#! next; +#! } - my $isOle = $wxMSW{$file} =~ /\bO\b/; + $isCFile = $file =~ /\.c$/; + + my $isOleObj = $wxMSW{$file} =~ /\bO\b/; $file =~ s/cp?p?$/obj/; - $project{"WXMSWOBJS"} .= ($isOle ? "\$(OLEDIR)\\" : "\$(MSWDIR)\\") - . $file . " " + my $obj = "\$(MSWDIR)\\" . $file . " "; + + $project{"WXMSWOBJS"} .= $obj; + if ( $isOleObj ) { + #! remember that this file is in ole subdir + $project{"WXOLEOBJS"} .= $obj; + } + $project{"WXCOBJS"} .= $obj if $isCFile; } #$} @@ -69,6 +85,7 @@ !endif WXDIR = $(WXWIN) +THISDIR = $(WXDIR)\src\msw # Set all these to 1 if you want to build a dynamic library !if "$(DLL)" == "1" @@ -81,7 +98,7 @@ WXBUILDDLL=1 # Please set these according to the settings in wx_setup.h, so we can include # the appropriate libraries in wx.lib USE_CTL3D=0 -USE_XPM_IN_MSW=0 +USE_XPM_IN_MSW=1 PERIPH_LIBS= PERIPH_TARGET= @@ -95,27 +112,28 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) !endif !if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) +PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS) PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) !endif -#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) +#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= -PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET) -PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET) +PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) +PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) !if "$(DLL)" == "0" DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32 import32 ole2w32 +LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff !endif LIBTARGET=$(WXLIB) GENDIR=..\generic COMMDIR=..\common +HTMLDIR=..\html OLEDIR=.\ole MSWDIR=. @@ -140,7 +158,9 @@ COMMONOBJS = \ MSWOBJS = #$ ExpandList("WXMSWOBJS"); -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); + +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) default: wx @@ -152,7 +172,7 @@ all: all_libs all_execs $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P512 @&&! + tlib "$(LIBTARGET)" /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! @@ -161,7 +181,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) -erase $(WXLIBDIR)\wx.dll - tlink32 $(LINK_FLAGS) /v @&&! + $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx nul @@ -194,7 +214,9 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c my @objs = split; foreach (@objs) { $text .= $_ . ": "; - s/obj$/\$(SRCSUFF)/; + if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; } + $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; + s/obj$/$suffix/; $text .= $_ . "\n\n"; } #$} @@ -229,6 +251,20 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c } #$} +######################################################## +# HTML objects (always compiled) + +#${ + $_ = $project{"WXHTMLOBJS"}; + my @objs = split; + foreach (@objs) { + $text .= $_ . ": "; + s/MSWDIR/HTMLDIR/; + s/obj$/\$(SRCSUFF)/; + $text .= $_ . "\n\n"; + } +#$} + all_utils: cd $(WXDIR)\utils @@ -285,11 +321,33 @@ clean_jpeg: make -f makefile.b32 clean cd $(WXDIR)\src\msw +xpm: $(CFG) + cd $(WXDIR)\src\xpm + make -f makefile.b32 lib + cd $(WXDIR)\src\msw + +clean_xpm: + cd $(WXDIR)\src\xpm + make -f makefile.b32 clean + cd $(WXDIR)\src\msw + +tiff: $(CFG) + cd $(WXDIR)\src\tiff + make -f makefile.b32 lib + cd $(WXDIR)\src\msw + +clean_tiff: + cd $(WXDIR)\src\tiff + make -f makefile.b32 clean + cd $(WXDIR)\src\msw + $(CFG): makefile.b32 copy &&! +-Hc -H=$(WXDIR)\src\msw\wx32.csm -3 -d +-a1 # byte alignment -R- -X -w-par @@ -298,10 +356,10 @@ $(CFG): makefile.b32 -WE -tWM --I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff -I$(WXDIR)\include\wx\msw\gnuwin32 --L$(BCCDIR)\lib +-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -D__WXWIN__ -D__WXMSW__ -D__WINDOWS__ @@ -311,23 +369,293 @@ $(DEBUG_FLAGS) $(WIN95FLAG) ! $(CFG) -#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib -# -Oxt - clean: $(PERIPH_CLEAN_TARGET) -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll + -erase $(WXLIBDIR)\wx.tds + -erase $(WXLIBDIR)\wx.il? -erase *.obj -erase *.pch -erase *.csm -erase *.cfg + -erase "wx32.#??" -erase ..\common\y_tab.c -erase ..\common\lex_yy.c cleanall: clean +# Making documents +docs: allhlp allhtml allpdfrtf +alldocs: docs +hlp: wxhlp portinghlp +wxhlp: $(DOCDIR)/winhelp/wx.hlp +prophlp: $(DOCDIR)/winhelp/prop.hlp +refhlp: $(DOCDIR)/winhelp/techref.hlp +rtf: $(DOCDIR)/winhelp/wx.rtf +proprtf: $(DOCDIR)/winhelp/prop.rtf +pdfrtf: $(DOCDIR)/pdf/wx.rtf +proppdfrtf: $(DOCDIR)/pdf/prop.rtf +refpdfrtf: $(DOCDIR)/pdf/techref.rtf +html: wxhtml portinghtml +wxhtml: $(DOCDIR)\html\wx\wx.htm +htmlhelp: $(DOCDIR)\html\wx\wx.chm +prophtml: $(DOCDIR)\html\proplist\prop.htm +ps: wxps referencps +wxps: $(WXDIR)\docs\ps\wx.ps +propps: $(WXDIR)\docs\ps\prop.ps +referencps: $(WXDIR)\docs\ps\referenc.ps + +portinghtml: $(DOCDIR)\html\porting\port.htm +portingrtf: $(DOCDIR)/winhelp/porting.rtf +portinghlp: $(DOCDIR)/winhelp/porting.hlp +portingpdfrtf: $(DOCDIR)/pdf/porting.rtf +portingps: $(WXDIR)\docs\ps\porting.ps + +allhlp: wxhlp portinghlp prophlp + cd $(WXDIR)\utils\dialoged\src + make -f makefile.b32 hlp + cd $(THISDIR) + +# cd $(WXDIR)\utils\wxhelp\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\tex2rtf\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\wxgraph\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\wxchart\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\wxtree\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\wxbuild\src +# make -f makefile.b32 hlp +# cd $(WXDIR)\utils\wxgrid\src +# make -f makefile.b32 hlp + +allhtml: wxhtml portinghtml prophtml + cd $(WXDIR)\utils\dialoged\src + make -f makefile.b32 html + cd $(THISDIR) + +# make -f makefile.b32 html +# cd $(WXDIR)\utils\dialoged\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\hytext\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\wxhelp\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\tex2rtf\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\wxgraph\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\wxchart\src +# make -f makefile.b32 html +# cd $(WXDIR)\utils\wxtree\src +# make -f makefile.b32 html + +allps: wxps referencps portingps propps + cd $(WXDIR)\utils\dialoged\src + make -f makefile.b32 ps + cd $(THISDIR) + +allpdfrtf: pdfrtf portingpdfrtf proppdfrtf + cd $(WXDIR)\utils\dialoged\src + make -f makefile.b32 pdfrtf + cd $(THISDIR) + +# cd $(WXDIR)\utils\wxhelp\src +# make -f makefile.b32 ps +# cd $(WXDIR)\utils\tex2rtf\src +# make -f makefile.b32 ps +# cd $(WXDIR)\utils\wxgraph\src +# make -f makefile.b32 ps +# cd $(WXDIR)\utils\wxchart\src +# make -f makefile.b32 ps +# cd $(WXDIR)\utils\wxtree\src +# make -f makefile.b32 ps +# cd $(THISDIR) + +$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj + cd $(DOCDIR)/latex/wx + -erase wx.ph + hc wx + move wx.hlp $(DOCDIR)\winhelp\wx.hlp + move wx.cnt $(DOCDIR)\winhelp\wx.cnt + cd $(THISDIR) + +$(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj + cd $(DOCDIR)/latex/porting + -erase porting.ph + hc porting + move porting.hlp $(DOCDIR)\winhelp\porting.hlp + move porting.cnt $(DOCDIR)\winhelp\porting.cnt + cd $(THISDIR) + +$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj + cd $(DOCDIR)/latex/proplist + -erase prop.ph + hc prop + move prop.hlp $(DOCDIR)\winhelp\prop.hlp + move prop.cnt $(DOCDIR)\winhelp\prop.cnt + cd $(THISDIR) + +$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj + cd $(DOCDIR)/latex/techref + -erase techref.ph + hc techref + move techref.hlp $(DOCDIR)\winhelp\techref.hlp + move techref.cnt $(DOCDIR)\winhelp\techref.cnt + cd $(THISDIR) + +$(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex + cd $(DOCDIR)\latex\wx + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp + cd $(THISDIR) + +$(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex + cd $(DOCDIR)\latex\porting + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp + cd $(THISDIR) + +$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex + cd $(DOCDIR)\latex\proplist + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp + cd $(THISDIR) + +$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex + cd $(DOCDIR)\latex\techref + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp + cd $(THISDIR) + +$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex + cd $(DOCDIR)\latex\wx + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf + cd $(THISDIR) + +$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex + cd $(DOCDIR)\latex\porting + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf + cd $(THISDIR) + +$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex + cd $(DOCDIR)\latex\proplist + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf + cd $(THISDIR) + +$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex + cd $(DOCDIR)\latex\techref + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf + -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf + cd $(THISDIR) + +$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex + cd $(DOCDIR)\latex\wx + -mkdir $(DOCDIR)\html\wx + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html + -erase $(DOCDIR)\html\wx\*.con + -erase $(DOCDIR)\html\wx\*.ref + -erase $(DOCDIR)\latex\wx\*.con + -erase $(DOCDIR)\latex\wx\*.ref + cd $(THISDIR) + +$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp + cd $(DOCDIR)\html\wx + -hhc wx.hhp + cd $(THISDIR) + + +$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex + cd $(DOCDIR)\latex\porting + -mkdir $(DOCDIR)\html\porting + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html + -erase $(DOCDIR)\html\porting\*.con + -erase $(DOCDIR)\html\porting\*.ref + -erase $(DOCDIR)\latex\porting\*.con + -erase $(DOCDIR)\latex\porting\*.ref + cd $(THISDIR) + +$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex + cd $(DOCDIR)\latex\proplist + -mkdir $(DOCDIR)\html\proplist + -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html + -erase $(DOCDIR)\html\proplist\*.con + -erase $(DOCDIR)\html\proplist\*.ref + -erase $(DOCDIR)\latex\proplist\*.con + -erase $(DOCDIR)\latex\proplist\*.ref + cd $(THISDIR) + +$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex + cd $(WXDIR)\docs\latex\wx + -latex manual + -latex manual + -makeindx manual + -bibtex manual + -latex manual + -latex manual + cd $(THISDIR) + +$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex + cd $(WXDIR)\docs\latex\porting + -latex porting + -latex porting + -makeindx porting + -bibtex porting + -latex porting + -latex porting + cd $(THISDIR) + +$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi + cd $(WXDIR)\docs\latex\wx + -dvips32 -o wx.ps manual + move wx.ps $(WXDIR)\docs\ps\wx.ps + cd $(THISDIR) + +$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi + cd $(WXDIR)\docs\latex\porting + -dvips32 -o porting.ps porting + move porting.ps $(WXDIR)\docs\ps\porting.ps + cd $(THISDIR) + +$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex + cd $(WXDIR)\docs\latex\wx + -latex referenc + -latex referenc + -makeindx referenc + -bibtex referenc + -latex referenc + -latex referenc + cd $(THISDIR) + +$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi + cd $(WXDIR)\docs\latex\wx + -dvips32 -o referenc.ps referenc + move referenc.ps $(WXDIR)\docs\ps\referenc.ps + cd $(THISDIR) + +# In order to force document reprocessing +touchmanual: + -touch $(WXDIR)\docs\latex\wx\manual.tex + +updatedocs: touchmanual alldocs + +# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the +# Office StartUp folder, and PDFMaker should be installed. +updatepdf: # touchmanual pdfrtf + start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF" + + MFTYPE=b32 -makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t +# 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