X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e97b17bbd1ebcda40b4ed10314755ecf35e8ae2..4d293f8ef41f405a8ea389ac3e00c0e268e4e305:/src/msw/makefile.wat?ds=sidebyside

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index b342d6efad..d2b526166f 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 15:55, 2000/03/14
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -29,92 +29,110 @@ LIBTARGET   = $(WXLIB)\wx.lib
 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 &
+	dcpsg.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 &
+	scrlwing.obj &
+	spinctlg.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 &
+	fdrepdlg.obj &
 	filedlgg.obj &
 	fontdlgg.obj &
 	helpext.obj &
 	helphtml.obj &
 	helpwxht.obj &
-	helpxlp.obj &
 	imaglist.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 &
 	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 &
 	docmdi.obj &
 	docview.obj &
+	dseldlg.obj &
 	dynarray.obj &
 	dynlib.obj &
+	effects.obj &
 	encconv.obj &
 	event.obj &
 	extended.obj &
+	fddlgcmn.obj &
 	ffile.obj &
 	file.obj &
 	fileconf.obj &
 	filefn.obj &
+	filename.obj &
 	filesys.obj &
 	fontcmn.obj &
 	fontmap.obj &
@@ -123,6 +141,7 @@ COMMONOBJS = &
 	fs_mem.obj &
 	fs_zip.obj &
 	ftp.obj &
+	gaugecmn.obj &
 	gdicmn.obj &
 	geometry.obj &
 	gifdecod.obj &
@@ -133,10 +152,12 @@ COMMONOBJS = &
 	imagbmp.obj &
 	image.obj &
 	imaggif.obj &
+	imagjpeg.obj &
 	imagpcx.obj &
 	imagpng.obj &
 	imagpnm.obj &
 	imagtiff.obj &
+	imagxpm.obj &
 	intl.obj &
 	ipcbase.obj &
 	layout.obj &
@@ -144,18 +165,24 @@ COMMONOBJS = &
 	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 &
+	regex.obj &
 	resource.obj &
 	sckaddr.obj &
 	sckfile.obj &
@@ -164,14 +191,18 @@ 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 &
 	url.obj &
@@ -184,6 +215,7 @@ COMMONOBJS = &
 	wincmn.obj &
 	wxchar.obj &
 	wxexpr.obj &
+	xpmdecod.obj &
 	zipstrm.obj &
 	zstream.obj
 
@@ -223,6 +255,8 @@ MSWOBJS = accel.obj &
 	dropsrc.obj &
 	droptgt.obj &
 	enhmeta.obj &
+	evtloop.obj &
+	fdrepdlg.obj &
 	filedlg.obj &
 	font.obj &
 	fontdlg.obj &
@@ -236,6 +270,8 @@ MSWOBJS = accel.obj &
 	glcanvas.obj &
 	gsocket.obj &
 	gsockmsw.obj &
+	helpbest.obj &
+	helpchm.obj &
 	helpwin.obj &
 	icon.obj &
 	imaglist.obj &
@@ -269,6 +305,7 @@ MSWOBJS = accel.obj &
 	settings.obj &
 	slider95.obj &
 	slidrmsw.obj &
+	snglinst.obj &
 	spinbutt.obj &
 	spinctrl.obj &
 	statbmp.obj &
@@ -281,21 +318,43 @@ MSWOBJS = accel.obj &
 	tbar95.obj &
 	tbarmsw.obj &
 	textctrl.obj &
+	tglbtn.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
@@ -425,6 +484,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) $<
 
@@ -464,6 +529,12 @@ 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) $<
+
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -563,6 +634,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) $<
 
@@ -599,6 +673,9 @@ tbarmsw.obj:     $(MSWDIR)\tbarmsw.cpp
 textctrl.obj:     $(MSWDIR)\textctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+tglbtn.obj:     $(MSWDIR)\tglbtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 thread.obj:     $(MSWDIR)\thread.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -608,6 +685,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) $<
 
@@ -626,9 +706,6 @@ wave.obj:     $(MSWDIR)\wave.cpp
 window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 
 
 ########################################################
@@ -643,15 +720,27 @@ 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) $<
+
 ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -667,12 +756,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) $<
 
@@ -688,12 +783,18 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dynarray.obj:     $(COMMDIR)\dynarray.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) $<
 
@@ -703,6 +804,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) $<
 
@@ -715,6 +819,9 @@ fileconf.obj:     $(COMMDIR)\fileconf.cpp
 filefn.obj:     $(COMMDIR)\filefn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+filename.obj:     $(COMMDIR)\filename.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -739,6 +846,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) $<
 
@@ -769,6 +879,9 @@ image.obj:     $(COMMDIR)\image.cpp
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -781,6 +894,9 @@ imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
 imagtiff.obj:     $(COMMDIR)\imagtiff.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagxpm.obj:     $(COMMDIR)\imagxpm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -802,6 +918,9 @@ log.obj:     $(COMMDIR)\log.cpp
 longlong.obj:     $(COMMDIR)\longlong.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+matrix.obj:     $(COMMDIR)\matrix.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 memory.obj:     $(COMMDIR)\memory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -817,6 +936,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) $<
 
@@ -829,6 +951,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) $<
 
@@ -838,6 +963,15 @@ process.obj:     $(COMMDIR)\process.cpp
 protocol.obj:     $(COMMDIR)\protocol.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+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) $<
 
@@ -862,6 +996,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) $<
 
@@ -871,6 +1008,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) $<
 
@@ -886,6 +1026,12 @@ 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) $<
+
 txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -922,6 +1068,9 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -954,12 +1103,21 @@ calctrl.obj:     $(GENDIR)\calctrl.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcpsg.obj:     $(GENDIR)\dcpsg.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) $<
 
@@ -975,9 +1133,6 @@ numdlgg.obj:     $(GENDIR)\numdlgg.cpp
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-plot.obj:     $(GENDIR)\plot.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -993,7 +1148,13 @@ 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
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 splitter.obj:     $(GENDIR)\splitter.cpp
@@ -1011,6 +1172,12 @@ textdlgg.obj:     $(GENDIR)\textdlgg.cpp
 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) $<
 
@@ -1019,72 +1186,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)
@@ -1135,16 +1302,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
@@ -1165,6 +1322,26 @@ clean_zlib:   .SYMBOLIC
     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