X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a925b006781f0ca0c93ac342b5bbb3deeb4409d6..bfedf6212c58824b38bffb7ebd9ec78479769141:/src/msw/makefile.wat?ds=sidebyside

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 8e8be7a545..c752958bfe 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:33, 1999/11/08
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -29,19 +29,28 @@ 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 regex
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
 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 &
+	dcbuffer.obj &
+	dcpsg.obj &
+	dirctrlg.obj &
+	dragimgg.obj &
 	grid.obj &
+	gridctrl.obj &
+	gridsel.obj &
 	laywin.obj &
 	logg.obj &
 	numdlgg.obj &
@@ -51,116 +60,159 @@ GENERICOBJS= busyinfo.obj &
 	propform.obj &
 	proplist.obj &
 	sashwin.obj &
-	scrolwin.obj &
+	scrlwing.obj &
+	spinctlg.obj &
+	splash.obj &
 	splitter.obj &
 	statusbr.obj &
-	tabg.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 &
+	mdig.obj &
 	msgdlgg.obj &
 	notebook.obj &
+	paletteg.obj &
 	printps.obj &
 	prntdlgg.obj &
 	statline.obj &
-	treectrl.obj
+	tabg.obj &
+	timer.obj
 
 COMMONOBJS = &
 	y_tab.obj &
 	appcmn.obj &
+	artprov.obj &
+	artstd.obj &
 	choiccmn.obj &
 	clipcmn.obj &
+	clntdata.obj &
+	cmdline.obj &
+	cmdproc.obj &
 	cmndata.obj &
 	config.obj &
+	containr.obj &
+	cshelp.obj &
 	ctrlcmn.obj &
 	ctrlsub.obj &
-	date.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 &
+	dynload.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 &
 	framecmn.obj &
 	fs_inet.obj &
+	fs_mem.obj &
 	fs_zip.obj &
 	ftp.obj &
+	gaugecmn.obj &
 	gdicmn.obj &
+	geometry.obj &
 	gifdecod.obj &
 	hash.obj &
+	hashmap.obj &
 	helpbase.obj &
 	http.obj &
+	iconbndl.obj &
 	imagall.obj &
 	imagbmp.obj &
 	image.obj &
+	imagfill.obj &
 	imaggif.obj &
+	imagiff.obj &
+	imagjpeg.obj &
 	imagpcx.obj &
 	imagpng.obj &
 	imagpnm.obj &
+	imagtiff.obj &
+	imagxpm.obj &
 	intl.obj &
 	ipcbase.obj &
 	layout.obj &
 	lboxcmn.obj &
 	list.obj &
 	log.obj &
+	longlong.obj &
+	matrix.obj &
 	memory.obj &
 	menucmn.obj &
-	mimetype.obj &
+	mimecmn.obj &
 	module.obj &
+	msgout.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 &
 	sckipc.obj &
 	sckstrm.obj &
-	serbase.obj &
+	settcmn.obj &
 	sizer.obj &
 	socket.obj &
+	statbar.obj &
 	strconv.obj &
 	stream.obj &
 	string.obj &
+	sysopt.obj &
 	tbarbase.obj &
-	tbarsmpl.obj &
+	textbuf.obj &
 	textcmn.obj &
 	textfile.obj &
-	time.obj &
 	timercmn.obj &
 	tokenzr.obj &
+	toplvcmn.obj &
+	treebase.obj &
 	txtstrm.obj &
 	unzip.obj &
 	url.obj &
@@ -173,6 +225,7 @@ COMMONOBJS = &
 	wincmn.obj &
 	wxchar.obj &
 	wxexpr.obj &
+	xpmdecod.obj &
 	zipstrm.obj &
 	zstream.obj
 
@@ -203,12 +256,17 @@ MSWOBJS = accel.obj &
 	dcscreen.obj &
 	dde.obj &
 	dialog.obj &
+	dialup.obj &
 	dib.obj &
 	dibutils.obj &
+	dir.obj &
 	dirdlg.obj &
 	dragimag.obj &
 	dropsrc.obj &
 	droptgt.obj &
+	enhmeta.obj &
+	evtloop.obj &
+	fdrepdlg.obj &
 	filedlg.obj &
 	font.obj &
 	fontdlg.obj &
@@ -217,8 +275,13 @@ MSWOBJS = accel.obj &
 	frame.obj &
 	gauge95.obj &
 	gaugemsw.obj &
+	gdiimage.obj &
 	gdiobj.obj &
+	glcanvas.obj &
 	gsocket.obj &
+	gsockmsw.obj &
+	helpbest.obj &
+	helpchm.obj &
 	helpwin.obj &
 	icon.obj &
 	imaglist.obj &
@@ -231,8 +294,10 @@ MSWOBJS = accel.obj &
 	menu.obj &
 	menuitem.obj &
 	metafile.obj &
+	mimetype.obj &
 	minifram.obj &
 	msgdlg.obj &
+	mslu.obj &
 	nativdlg.obj &
 	notebook.obj &
 	oleutils.obj &
@@ -240,6 +305,7 @@ MSWOBJS = accel.obj &
 	palette.obj &
 	pen.obj &
 	penwin.obj &
+	popupwin.obj &
 	printdlg.obj &
 	printwin.obj &
 	radiobox.obj &
@@ -251,6 +317,7 @@ MSWOBJS = accel.obj &
 	settings.obj &
 	slider95.obj &
 	slidrmsw.obj &
+	snglinst.obj &
 	spinbutt.obj &
 	spinctrl.obj &
 	statbmp.obj &
@@ -263,21 +330,54 @@ 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 &
+	volume.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_pre.obj &
+	m_style.obj &
+	m_tables.obj &
+	winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+
+ARCHINCDIR=$(WXDIR)\lib\msw
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
 
-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\msw\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -380,12 +480,18 @@ dde.obj:     $(MSWDIR)\dde.cpp
 dialog.obj:     $(MSWDIR)\dialog.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dialup.obj:     $(MSWDIR)\dialup.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dib.obj:     $(MSWDIR)\dib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dibutils.obj:     $(MSWDIR)\dibutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dir.obj:     $(MSWDIR)\dir.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -398,6 +504,15 @@ dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
 droptgt.obj:     $(OLEDIR)\droptgt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+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) $<
 
@@ -422,12 +537,27 @@ gauge95.obj:     $(MSWDIR)\gauge95.cpp
 gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gdiimage.obj:     $(MSWDIR)\gdiimage.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+glcanvas.obj:     $(MSWDIR)\glcanvas.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gsocket.obj:     $(MSWDIR)\gsocket.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+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) $<
 
@@ -464,12 +594,18 @@ menuitem.obj:     $(MSWDIR)\menuitem.cpp
 metafile.obj:     $(MSWDIR)\metafile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mimetype.obj:     $(MSWDIR)\mimetype.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 minifram.obj:     $(MSWDIR)\minifram.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mslu.obj:     $(MSWDIR)\mslu.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -491,6 +627,9 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+popupwin.obj:     $(MSWDIR)\popupwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 printdlg.obj:     $(MSWDIR)\printdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -524,6 +663,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) $<
 
@@ -560,6 +702,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) $<
 
@@ -569,6 +714,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) $<
 
@@ -581,13 +729,13 @@ utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
 uuid.obj:     $(OLEDIR)\uuid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wave.obj:     $(MSWDIR)\wave.cpp
+volume.obj:     $(MSWDIR)\volume.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-window.obj:     $(MSWDIR)\window.cpp
+wave.obj:     $(MSWDIR)\wave.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
+window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 
@@ -598,25 +746,46 @@ xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+artprov.obj:     $(COMMDIR)\artprov.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj:     $(COMMDIR)\artstd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-date.obj:     $(COMMDIR)\date.cpp
+datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 datstrm.obj:     $(COMMDIR)\datstrm.cpp
@@ -625,15 +794,24 @@ 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) $<
 
+dndcmn.obj:     $(COMMDIR)\dndcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dobjcmn.obj:     $(COMMDIR)\dobjcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -643,18 +821,33 @@ 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) $<
 
+dynload.obj:     $(COMMDIR)\dynload.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+effects.obj:     $(COMMDIR)\effects.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+encconv.obj:     $(COMMDIR)\encconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 extended.obj:     $(COMMDIR)\extended.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+fddlgcmn.obj:     $(COMMDIR)\fddlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 ffile.obj:     $(COMMDIR)\ffile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -667,6 +860,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) $<
 
@@ -682,27 +878,42 @@ framecmn.obj:     $(COMMDIR)\framecmn.cpp
 fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fs_mem.obj:     $(COMMDIR)\fs_mem.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ftp.obj:     $(COMMDIR)\ftp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gaugecmn.obj:     $(COMMDIR)\gaugecmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+geometry.obj:     $(COMMDIR)\geometry.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+hashmap.obj:     $(COMMDIR)\hashmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpbase.obj:     $(COMMDIR)\helpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -712,9 +923,18 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagfill.obj:     $(COMMDIR)\imagfill.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagiff.obj:     $(COMMDIR)\imagiff.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -724,6 +944,12 @@ imagpng.obj:     $(COMMDIR)\imagpng.cpp
 imagpnm.obj:     $(COMMDIR)\imagpnm.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) $<
 
@@ -742,25 +968,34 @@ list.obj:     $(COMMDIR)\list.cpp
 log.obj:     $(COMMDIR)\log.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) $<
 
 menucmn.obj:     $(COMMDIR)\menucmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mimetype.obj:     $(COMMDIR)\mimetype.cpp
+mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+msgout.obj:     $(COMMDIR)\msgout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-object.obj:     $(COMMDIR)\object.cpp
+nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
+object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 odbc.obj:     $(COMMDIR)\odbc.cpp
@@ -769,6 +1004,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) $<
 
@@ -778,6 +1016,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) $<
 
@@ -793,7 +1040,7 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-serbase.obj:     $(COMMDIR)\serbase.cpp
+settcmn.obj:     $(COMMDIR)\settcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sizer.obj:     $(COMMDIR)\sizer.cpp
@@ -802,6 +1049,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) $<
 
@@ -811,10 +1061,13 @@ 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) $<
 
-tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
+textbuf.obj:     $(COMMDIR)\textbuf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 textcmn.obj:     $(COMMDIR)\textcmn.cpp
@@ -823,15 +1076,18 @@ textcmn.obj:     $(COMMDIR)\textcmn.cpp
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-time.obj:     $(COMMDIR)\time.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 timercmn.obj:     $(COMMDIR)\timercmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
@@ -868,6 +1124,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) $<
 
@@ -894,12 +1153,33 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 busyinfo.obj:     $(GENDIR)\busyinfo.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+calctrl.obj:     $(GENDIR)\calctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.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) $<
+
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -927,7 +1207,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
@@ -936,7 +1222,7 @@ splitter.obj:     $(GENDIR)\splitter.cpp
 statusbr.obj:     $(GENDIR)\statusbr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tabg.obj:     $(GENDIR)\tabg.cpp
+tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 textdlgg.obj:     $(GENDIR)\textdlgg.cpp
@@ -945,159 +1231,138 @@ textdlgg.obj:     $(GENDIR)\textdlgg.cpp
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wizard.obj:     $(GENDIR)\wizard.cpp
+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) $<
-
-crdatfri.obj: $(XPMDIR)\crdatfri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crdatfrp.obj: $(XPMDIR)\crdatfrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-create.obj: $(XPMDIR)\create.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crifrbuf.obj: $(XPMDIR)\crifrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crifrdat.obj: $(XPMDIR)\crifrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+wizard.obj:     $(GENDIR)\wizard.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-crpfrdat.obj: $(XPMDIR)\crpfrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-# TODO: what to do about this clash of filename????
-#data.obj: $(XPMDIR)\data.c
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-hashtab.obj: $(XPMDIR)\hashtab.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+########################################################
+# HTML objects (always compiled)
 
-misc.obj: $(XPMDIR)\misc.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpctrl.obj:     $(HTMLDIR)\helpctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-parse.obj: $(XPMDIR)\parse.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpdata.obj:     $(HTMLDIR)\helpdata.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftodat.obj: $(XPMDIR)\rdftodat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpfrm.obj:     $(HTMLDIR)\helpfrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftoi.obj: $(XPMDIR)\rdftoi.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlcell.obj:     $(HTMLDIR)\htmlcell.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftop.obj: $(XPMDIR)\rdftop.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlfilt.obj:     $(HTMLDIR)\htmlfilt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rgb.obj: $(XPMDIR)\rgb.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlpars.obj:     $(HTMLDIR)\htmlpars.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-scan.obj: $(XPMDIR)\scan.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmltag.obj:     $(HTMLDIR)\htmltag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-simx.obj: $(XPMDIR)\simx.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlwin.obj:     $(HTMLDIR)\htmlwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wrffrdat.obj: $(XPMDIR)\wrffrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmprint.obj:     $(HTMLDIR)\htmprint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wrffri.obj: $(XPMDIR)\wrffri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+m_dflist.obj:     $(HTMLDIR)\m_dflist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wrffrp.obj: $(XPMDIR)\wrffrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+m_fonts.obj:     $(HTMLDIR)\m_fonts.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
+m_hline.obj:     $(HTMLDIR)\m_hline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+m_image.obj:     $(HTMLDIR)\m_image.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-compress.obj: compress.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+m_layout.obj:     $(HTMLDIR)\m_layout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+m_links.obj:     $(HTMLDIR)\m_links.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+m_list.obj:     $(HTMLDIR)\m_list.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+m_pre.obj:     $(HTMLDIR)\m_pre.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
+m_style.obj:     $(HTMLDIR)\m_style.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
+m_tables.obj:     $(HTMLDIR)\m_tables.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-	$(CC) -c $(CFLAGS) $*.c
+winpars.obj:     $(HTMLDIR)\winpars.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-	$(CC) -c $(CFLAGS) $*.c
 
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
 
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
+png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
 
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+clean_png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
 
-uncompr.obj: uncompr.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
 
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
+clean_zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
 
-xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
+jpeg:    .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
     wmake -f makefile.wat all
     cd $(WXDIR)\src\msw
 
-clean_xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
+clean_jpeg:   .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
-png:   .SYMBOLIC
-    cd $(WXDIR)\src\png
+tiff:    .SYMBOLIC
+    cd $(WXDIR)\src\tiff
     wmake -f makefile.wat all
     cd $(WXDIR)\src\msw
 
-clean_png:   .SYMBOLIC
-    cd $(WXDIR)\src\png
+clean_tiff:   .SYMBOLIC
+    cd $(WXDIR)\src\tiff
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
-zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
+regex:    .SYMBOLIC
+    cd $(WXDIR)\src\regex
     wmake -f makefile.wat all
     cd $(WXDIR)\src\msw
 
-clean_zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
+clean_regex:   .SYMBOLIC
+    cd $(WXDIR)\src\regex
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
 MFTYPE=wat
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-	cd $(WXWIN)\distrib\msw\tmake
+self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXDIR)\distrib\msw\tmake
 	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+	copy makefile.$(MFTYPE) $(WXDIR)\src\msw