#!/binb/wmake.exe
-# This file was automatically generated by tmake at 12:25, 2000/02/28
+# This file was automatically generated by tmake at 20:23, 2001/07/02
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
DUMMY=dummydll
# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+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
GENERICOBJS= busyinfo.obj &
calctrl.obj &
choicdgg.obj &
+ dirctrlg.obj &
+ dragimgg.obj &
grid.obj &
+ gridctrl.obj &
+ gridsel.obj &
laywin.obj &
logg.obj &
numdlgg.obj &
panelg.obj &
- plot.obj &
progdlgg.obj &
prop.obj &
propform.obj &
proplist.obj &
sashwin.obj &
scrolwin.obj &
+ splash.obj &
splitter.obj &
statusbr.obj &
tbarsmpl.obj &
textdlgg.obj &
tipdlg.obj &
+ tipwin.obj &
+ treectlg.obj &
treelay.obj &
wizard.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 &
listctrl.obj &
msgdlgg.obj &
notebook.obj &
+ paletteg.obj &
printps.obj &
prntdlgg.obj &
statline.obj &
- tabg.obj &
- treectrl.obj
+ tabg.obj
COMMONOBJS = &
y_tab.obj &
choiccmn.obj &
clipcmn.obj &
cmdline.obj &
+ cmdproc.obj &
cmndata.obj &
config.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 &
docview.obj &
dynarray.obj &
dynlib.obj &
+ effects.obj &
encconv.obj &
event.obj &
extended.obj &
file.obj &
fileconf.obj &
filefn.obj &
+ filename.obj &
filesys.obj &
fontcmn.obj &
fontmap.obj &
imagbmp.obj &
image.obj &
imaggif.obj &
+ imagjpeg.obj &
imagpcx.obj &
imagpng.obj &
imagpnm.obj &
imagtiff.obj &
+ imagxpm.obj &
intl.obj &
ipcbase.obj &
layout.obj &
list.obj &
log.obj &
longlong.obj &
+ matrix.obj &
memory.obj &
menucmn.obj &
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 &
resource.obj &
sckaddr.obj &
sckfile.obj &
textfile.obj &
timercmn.obj &
tokenzr.obj &
+ treebase.obj &
txtstrm.obj &
unzip.obj &
url.obj &
wincmn.obj &
wxchar.obj &
wxexpr.obj &
+ xpmdecod.obj &
zipstrm.obj &
zstream.obj
gdiobj.obj &
glcanvas.obj &
gsocket.obj &
+ gsockmsw.obj &
+ helpchm.obj &
helpwin.obj &
icon.obj &
imaglist.obj &
settings.obj &
slider95.obj &
slidrmsw.obj &
+ snglinst.obj &
spinbutt.obj &
spinctrl.obj &
statbmp.obj &
tbar95.obj &
tbarmsw.obj &
textctrl.obj &
+ tglbtn.obj &
thread.obj &
timer.obj &
tooltip.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
gsocket.obj: $(MSWDIR)\gsocket.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
+gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+ *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpchm.obj: $(MSWDIR)\helpchm.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
helpwin.obj: $(MSWDIR)\helpwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+snglinst.obj: $(MSWDIR)\snglinst.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
spinbutt.obj: $(MSWDIR)\spinbutt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
textctrl.obj: $(MSWDIR)\textctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+tglbtn.obj: $(MSWDIR)\tglbtn.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
thread.obj: $(MSWDIR)\thread.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
window.obj: $(MSWDIR)\window.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-xpmhand.obj: $(MSWDIR)\xpmhand.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) $<
+cshelp.obj: $(COMMDIR)\cshelp.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
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) $<
dynlib.obj: $(COMMDIR)\dynlib.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+effects.obj: $(COMMDIR)\effects.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
encconv.obj: $(COMMDIR)\encconv.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
filefn.obj: $(COMMDIR)\filefn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+filename.obj: $(COMMDIR)\filename.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
filesys.obj: $(COMMDIR)\filesys.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaggif.obj: $(COMMDIR)\imaggif.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
imagpcx.obj: $(COMMDIR)\imagpcx.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagtiff.obj: $(COMMDIR)\imagtiff.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+imagxpm.obj: $(COMMDIR)\imagxpm.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
intl.obj: $(COMMDIR)\intl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
longlong.obj: $(COMMDIR)\longlong.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+matrix.obj: $(COMMDIR)\matrix.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
memory.obj: $(COMMDIR)\memory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
mstream.obj: $(COMMDIR)\mstream.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+nbkbase.obj: $(COMMDIR)\nbkbase.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
object.obj: $(COMMDIR)\object.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
paper.obj: $(COMMDIR)\paper.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+popupcmn.obj: $(COMMDIR)\popupcmn.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
prntbase.obj: $(COMMDIR)\prntbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
protocol.obj: $(COMMDIR)\protocol.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+quantize.obj: $(COMMDIR)\quantize.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+radiocmn.obj: $(COMMDIR)\radiocmn.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
resource.obj: $(COMMDIR)\resource.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tokenzr.obj: $(COMMDIR)\tokenzr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+treebase.obj: $(COMMDIR)\treebase.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
txtstrm.obj: $(COMMDIR)\txtstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wxexpr.obj: $(COMMDIR)\wxexpr.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+xpmdecod.obj: $(COMMDIR)\xpmdecod.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
zipstrm.obj: $(COMMDIR)\zipstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
choicdgg.obj: $(GENDIR)\choicdgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+dirctrlg.obj: $(GENDIR)\dirctrlg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dragimgg.obj: $(GENDIR)\dragimgg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
grid.obj: $(GENDIR)\grid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+gridctrl.obj: $(GENDIR)\gridctrl.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gridsel.obj: $(GENDIR)\gridsel.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
laywin.obj: $(GENDIR)\laywin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
panelg.obj: $(GENDIR)\panelg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-plot.obj: $(GENDIR)\plot.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
progdlgg.obj: $(GENDIR)\progdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
scrolwin.obj: $(GENDIR)\scrolwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+splash.obj: $(GENDIR)\splash.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
splitter.obj: $(GENDIR)\splitter.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tipdlg.obj: $(GENDIR)\tipdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+tipwin.obj: $(GENDIR)\tipwin.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+treectlg.obj: $(GENDIR)\treectlg.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
treelay.obj: $(GENDIR)\treelay.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-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)
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
wmake -f makefile.wat clean
cd $(WXDIR)\src\msw
+jpeg: .SYMBOLIC
+ cd $(WXDIR)\src\jpeg
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_jpeg: .SYMBOLIC
+ cd $(WXDIR)\src\jpeg
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
+
+tiff: .SYMBOLIC
+ cd $(WXDIR)\src\tiff
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_tiff: .SYMBOLIC
+ cd $(WXDIR)\src\tiff
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
+
MFTYPE=wat
self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXDIR)\distrib\msw\tmake