From: Robert Roebling Date: Sat, 9 Feb 2002 18:47:20 +0000 (+0000) Subject: tmake update. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6cec3db8ce53752adb51f4ff1c4c3bfea6882c9 tmake update. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/files.lst b/src/msw/files.lst index edae29e67d..ff8f90d8a3 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -111,6 +111,7 @@ ALL_SOURCES = \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ + common/odbc.cpp \ common/paper.cpp \ common/popupcmn.cpp \ common/prntbase.cpp \ @@ -755,6 +756,7 @@ COMMONOBJS = \ mstream.o \ nbkbase.o \ object.o \ + odbc.o \ paper.o \ popupcmn.o \ prntbase.o \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 46d97d1861..842b28ac72 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -372,7 +372,13 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) default: wx -wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +wx: setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) + +# TODO: put the setup.h under lib +setuph: + cd $(WXDIR)\include\wx\msw + if not exist setup.h copy setup0.h setup.h + cd $(WXDIR)\src\msw all: wx diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 57c9439004..bdbc667a9e 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index d0496d8727..657335adff 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 620f341540..921389e58c 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 104e6ae5be..f4062f56b6 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -735,17 +735,14 @@ docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp alldocs: docs hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml htb: $(DOCDIR)\htb\wx.htb wxhtml: $(DOCDIR)\html\wx\wx.htm htmlhelp: $(DOCDIR)\htmlhelp\wx.chm -ps: wxps referencps +ps: wxps wxps: $(WXDIR)\docs\ps\wx.ps -referencps: $(WXDIR)\docs\ps\referenc.ps allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src @@ -762,7 +759,6 @@ allhtml: wxhtml cd $(WXDIR)\utils\tex2rtf\src nmake -f makefile.vc html cd $(WXDIR)\contrib\src\fl - nmake -f makefile.vc html cd $(THISDIR) allhtmlhelp: htmlhelp @@ -811,24 +807,11 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w move wx.cnt $(DOCDIR)\winhelp\wx.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/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 @@ -836,13 +819,6 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.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 diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index cc553f349c..7f9244b131 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! #