X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c97e7fa8dbda704c9c9cdb61c22ebdf9b692e114..f056ea60f3a14553a7ca76451f45ebd4d1ecd58b:/src/msw/makefile.wat diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index d230d3c653..1d32e9886e 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 01:26, 2001/04/29 +# This file was automatically generated by tmake at 23:49, 2001/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -29,15 +29,15 @@ LIBTARGET = $(WXLIB)\wx.lib DUMMY=dummydll # ODBCLIB = ..\..\contrib\odbc\odbc32.lib -EXTRATARGETS = xpm png zlib jpeg tiff -EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff +EXTRATARGETS = png zlib jpeg tiff +EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff GENDIR=$(WXDIR)\src\generic COMMDIR=$(WXDIR)\src\common -XPMDIR=$(WXDIR)\src\xpm JPEGDIR=$(WXDIR)\src\jpeg TIFFDIR=$(WXDIR)\src\tiff MSWDIR=$(WXDIR)\src\msw OLEDIR=$(MSWDIR)\ole +HTMLDIR=$(WXDIR)\src\html DOCDIR = $(WXDIR)\docs @@ -47,6 +47,7 @@ GENERICOBJS= busyinfo.obj & dirctrlg.obj & dragimgg.obj & grid.obj & + gridctrl.obj & gridsel.obj & laywin.obj & logg.obj & @@ -57,7 +58,8 @@ GENERICOBJS= busyinfo.obj & propform.obj & proplist.obj & sashwin.obj & - scrolwin.obj & + scrlwing.obj & + spinctlg.obj & splash.obj & splitter.obj & statusbr.obj & @@ -71,16 +73,17 @@ GENERICOBJS= busyinfo.obj & # These are generic things that don't need to be compiled on MSW, # but sometimes it's useful to do so for testing purposes. -NONESSENTIALOBJS= caret.obj & +NONESSENTIALOBJS= accel.obj & + caret.obj & colrdlgg.obj & dcpsg.obj & dirdlgg.obj & + fdrepdlg.obj & filedlgg.obj & fontdlgg.obj & helpext.obj & helphtml.obj & helpwxht.obj & - helpxlp.obj & imaglist.obj & listctrl.obj & msgdlgg.obj & @@ -96,17 +99,22 @@ COMMONOBJS = & appcmn.obj & choiccmn.obj & clipcmn.obj & + clntdata.obj & cmdline.obj & + cmdproc.obj & cmndata.obj & config.obj & + containr.obj & cshelp.obj & ctrlcmn.obj & ctrlsub.obj & datetime.obj & datstrm.obj & db.obj & + dbgrid.obj & dbtable.obj & dcbase.obj & + dircmn.obj & dlgcmn.obj & dndcmn.obj & dobjcmn.obj & @@ -118,6 +126,7 @@ COMMONOBJS = & encconv.obj & event.obj & extended.obj & + fddlgcmn.obj & ffile.obj & file.obj & fileconf.obj & @@ -131,6 +140,7 @@ COMMONOBJS = & fs_mem.obj & fs_zip.obj & ftp.obj & + gaugecmn.obj & gdicmn.obj & geometry.obj & gifdecod.obj & @@ -160,14 +170,18 @@ COMMONOBJS = & mimecmn.obj & module.obj & mstream.obj & + nbkbase.obj & object.obj & objstrm.obj & odbc.obj & paper.obj & + popupcmn.obj & prntbase.obj & process.obj & protocol.obj & quantize.obj & + radiocmn.obj & + regex.obj & resource.obj & sckaddr.obj & sckfile.obj & @@ -176,14 +190,17 @@ COMMONOBJS = & serbase.obj & sizer.obj & socket.obj & + statbar.obj & strconv.obj & stream.obj & string.obj & + sysopt.obj & tbarbase.obj & textcmn.obj & textfile.obj & timercmn.obj & tokenzr.obj & + toplvcmn.obj & treebase.obj & txtstrm.obj & unzip.obj & @@ -237,6 +254,8 @@ MSWOBJS = accel.obj & dropsrc.obj & droptgt.obj & enhmeta.obj & + evtloop.obj & + fdrepdlg.obj & filedlg.obj & font.obj & fontdlg.obj & @@ -250,6 +269,7 @@ MSWOBJS = accel.obj & glcanvas.obj & gsocket.obj & gsockmsw.obj & + helpbest.obj & helpchm.obj & helpwin.obj & icon.obj & @@ -284,6 +304,7 @@ MSWOBJS = accel.obj & settings.obj & slider95.obj & slidrmsw.obj & + snglinst.obj & spinbutt.obj & spinctrl.obj & statbmp.obj & @@ -300,18 +321,39 @@ MSWOBJS = accel.obj & thread.obj & timer.obj & tooltip.obj & + toplevel.obj & treectrl.obj & utils.obj & utilsexc.obj & uuid.obj & wave.obj & - window.obj & - xpmhand.obj + window.obj + +HTMLOBJS = helpctrl.obj & + helpdata.obj & + helpfrm.obj & + htmlcell.obj & + htmlfilt.obj & + htmlpars.obj & + htmltag.obj & + htmlwin.obj & + htmprint.obj & + m_dflist.obj & + m_fonts.obj & + m_hline.obj & + m_image.obj & + m_layout.obj & + m_links.obj & + m_list.obj & + m_meta.obj & + m_pre.obj & + m_tables.obj & + winpars.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) +all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC $(LIBTARGET) : $(OBJECTS) %create tmp.lbc @@ -441,6 +483,12 @@ droptgt.obj: $(OLEDIR)\droptgt.cpp enhmeta.obj: $(MSWDIR)\enhmeta.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +evtloop.obj: $(MSWDIR)\evtloop.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +fdrepdlg.obj: $(MSWDIR)\fdrepdlg.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + filedlg.obj: $(MSWDIR)\filedlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -480,6 +528,9 @@ gsocket.obj: $(MSWDIR)\gsocket.c gsockmsw.obj: $(MSWDIR)\gsockmsw.c *$(CC) $(CPPFLAGS) $(IFLAGS) $< +helpbest.obj: $(MSWDIR)\helpbest.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + helpchm.obj: $(MSWDIR)\helpchm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -582,6 +633,9 @@ slider95.obj: $(MSWDIR)\slider95.cpp slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +snglinst.obj: $(MSWDIR)\snglinst.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + spinbutt.obj: $(MSWDIR)\spinbutt.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -630,6 +684,9 @@ timer.obj: $(MSWDIR)\timer.cpp tooltip.obj: $(MSWDIR)\tooltip.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +toplevel.obj: $(MSWDIR)\toplevel.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + treectrl.obj: $(MSWDIR)\treectrl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -648,9 +705,6 @@ wave.obj: $(MSWDIR)\wave.cpp window.obj: $(MSWDIR)\window.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -xpmhand.obj: $(MSWDIR)\xpmhand.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - ######################################################## @@ -665,15 +719,24 @@ choiccmn.obj: $(COMMDIR)\choiccmn.cpp clipcmn.obj: $(COMMDIR)\clipcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +clntdata.obj: $(COMMDIR)\clntdata.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + cmdline.obj: $(COMMDIR)\cmdline.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +cmdproc.obj: $(COMMDIR)\cmdproc.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + cmndata.obj: $(COMMDIR)\cmndata.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< config.obj: $(COMMDIR)\config.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +containr.obj: $(COMMDIR)\containr.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + cshelp.obj: $(COMMDIR)\cshelp.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -692,12 +755,18 @@ datstrm.obj: $(COMMDIR)\datstrm.cpp db.obj: $(COMMDIR)\db.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dbgrid.obj: $(COMMDIR)\dbgrid.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + dbtable.obj: $(COMMDIR)\dbtable.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< dcbase.obj: $(COMMDIR)\dcbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dircmn.obj: $(COMMDIR)\dircmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -731,6 +800,9 @@ event.obj: $(COMMDIR)\event.cpp extended.obj: $(COMMDIR)\extended.c *$(CC) $(CPPFLAGS) $(IFLAGS) $< +fddlgcmn.obj: $(COMMDIR)\fddlgcmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + ffile.obj: $(COMMDIR)\ffile.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -770,6 +842,9 @@ fs_zip.obj: $(COMMDIR)\fs_zip.cpp ftp.obj: $(COMMDIR)\ftp.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +gaugecmn.obj: $(COMMDIR)\gaugecmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + gdicmn.obj: $(COMMDIR)\gdicmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -857,6 +932,9 @@ module.obj: $(COMMDIR)\module.cpp mstream.obj: $(COMMDIR)\mstream.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +nbkbase.obj: $(COMMDIR)\nbkbase.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + object.obj: $(COMMDIR)\object.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -869,6 +947,9 @@ odbc.obj: $(COMMDIR)\odbc.cpp paper.obj: $(COMMDIR)\paper.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +popupcmn.obj: $(COMMDIR)\popupcmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + prntbase.obj: $(COMMDIR)\prntbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -881,6 +962,12 @@ protocol.obj: $(COMMDIR)\protocol.cpp quantize.obj: $(COMMDIR)\quantize.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +radiocmn.obj: $(COMMDIR)\radiocmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +regex.obj: $(COMMDIR)\regex.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + resource.obj: $(COMMDIR)\resource.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -905,6 +992,9 @@ sizer.obj: $(COMMDIR)\sizer.cpp socket.obj: $(COMMDIR)\socket.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +statbar.obj: $(COMMDIR)\statbar.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + strconv.obj: $(COMMDIR)\strconv.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -914,6 +1004,9 @@ stream.obj: $(COMMDIR)\stream.cpp string.obj: $(COMMDIR)\string.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +sysopt.obj: $(COMMDIR)\sysopt.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + tbarbase.obj: $(COMMDIR)\tbarbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -929,6 +1022,9 @@ timercmn.obj: $(COMMDIR)\timercmn.cpp tokenzr.obj: $(COMMDIR)\tokenzr.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +toplvcmn.obj: $(COMMDIR)\toplvcmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + treebase.obj: $(COMMDIR)\treebase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1012,6 +1108,9 @@ dragimgg.obj: $(GENDIR)\dragimgg.cpp grid.obj: $(GENDIR)\grid.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +gridctrl.obj: $(GENDIR)\gridctrl.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + gridsel.obj: $(GENDIR)\gridsel.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1042,7 +1141,10 @@ proplist.obj: $(GENDIR)\proplist.cpp sashwin.obj: $(GENDIR)\sashwin.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -scrolwin.obj: $(GENDIR)\scrolwin.cpp +scrlwing.obj: $(GENDIR)\scrlwing.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +spinctlg.obj: $(GENDIR)\spinctlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< splash.obj: $(GENDIR)\splash.cpp @@ -1077,72 +1179,72 @@ wizard.obj: $(GENDIR)\wizard.cpp -crbuffri.obj: $(XPMDIR)\crbuffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< -crbuffrp.obj: $(XPMDIR)\crbuffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +######################################################## +# HTML objects (always compiled) -crdatfri.obj: $(XPMDIR)\crdatfri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +helpctrl.obj: $(HTMLDIR)\helpctrl.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -crdatfrp.obj: $(XPMDIR)\crdatfrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +helpdata.obj: $(HTMLDIR)\helpdata.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -create.obj: $(XPMDIR)\create.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +helpfrm.obj: $(HTMLDIR)\helpfrm.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -crifrbuf.obj: $(XPMDIR)\crifrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmlcell.obj: $(HTMLDIR)\htmlcell.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -crifrdat.obj: $(XPMDIR)\crifrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmlfilt.obj: $(HTMLDIR)\htmlfilt.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmlpars.obj: $(HTMLDIR)\htmlpars.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -crpfrdat.obj: $(XPMDIR)\crpfrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmltag.obj: $(HTMLDIR)\htmltag.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -# TODO: what to do about this clash of filename???? -#data.obj: $(XPMDIR)\data.c -# *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmlwin.obj: $(HTMLDIR)\htmlwin.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -hashtab.obj: $(XPMDIR)\hashtab.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +htmprint.obj: $(HTMLDIR)\htmprint.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -misc.obj: $(XPMDIR)\misc.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_dflist.obj: $(HTMLDIR)\m_dflist.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -parse.obj: $(XPMDIR)\parse.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_fonts.obj: $(HTMLDIR)\m_fonts.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -rdftodat.obj: $(XPMDIR)\rdftodat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_hline.obj: $(HTMLDIR)\m_hline.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -rdftoi.obj: $(XPMDIR)\rdftoi.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_image.obj: $(HTMLDIR)\m_image.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -rdftop.obj: $(XPMDIR)\rdftop.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_layout.obj: $(HTMLDIR)\m_layout.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -rgb.obj: $(XPMDIR)\rgb.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_links.obj: $(HTMLDIR)\m_links.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -scan.obj: $(XPMDIR)\scan.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_list.obj: $(HTMLDIR)\m_list.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -simx.obj: $(XPMDIR)\simx.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< +m_meta.obj: $(HTMLDIR)\m_meta.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +m_pre.obj: $(HTMLDIR)\m_pre.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +m_tables.obj: $(HTMLDIR)\m_tables.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +winpars.obj: $(HTMLDIR)\winpars.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -wrffrdat.obj: $(XPMDIR)\wrffrdat.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< -wrffri.obj: $(XPMDIR)\wrffri.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< -wrffrp.obj: $(XPMDIR)\wrffrp.c - *$(CC) $(CPPFLAGS) $(IFLAGS) $< OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ trees$(O) @@ -1193,16 +1295,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h zutil.obj: zutil.c zutil.h zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c -xpm: .SYMBOLIC - cd $(WXDIR)\src\xpm - wmake -f makefile.wat all - cd $(WXDIR)\src\msw - -clean_xpm: .SYMBOLIC - cd $(WXDIR)\src\xpm - wmake -f makefile.wat clean - cd $(WXDIR)\src\msw - png: .SYMBOLIC cd $(WXDIR)\src\png wmake -f makefile.wat all