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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index e9a635815c..10b8d512e7 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,16 +1,23 @@
+#!/binb/wmake.exe
 
-
-# This file was automatically generated by tmake at 14:25, 1999/07/23
+# This file was automatically generated by tmake at 15:57, 2000/08/04
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
-#!/binb/wmake.exe
-
 #
 # File:     makefile.wat
 # Author:   Julian Smart
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
+#
+# NOTE: This file is generated from wat.t by tmake, but not all bugs have
+# been removed from this process. If wxWindows doesn't compile,
+# check the following and edit this makefile accordingly:
+#
+# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
+#   to the path.
+# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
+#   They may also be wrongly specified as extended.cpp, etc.
 
 WXDIR = ..\..
 
@@ -22,40 +29,57 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+EXTRATARGETS = xpm png zlib jpeg tiff
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
-OLEDIR=ole
+JPEGDIR=$(WXDIR)\src\jpeg
+TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
+OLEDIR=$(MSWDIR)\ole
 
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
+	calctrl.obj &
 	choicdgg.obj &
-	extdlgg.obj &
-	gridg.obj &
+	dirctrlg.obj &
+	dragimgg.obj &
+	grid.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 &
 	tabg.obj &
+	tbarsmpl.obj &
 	textdlgg.obj &
-	tipdlg.obj
+	tipdlg.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= colrdlgg.obj &
+NONESSENTIALOBJS= caret.obj &
+	colrdlgg.obj &
+	dcpsg.obj &
 	dirdlgg.obj &
+	filedlgg.obj &
 	fontdlgg.obj &
+	helpext.obj &
+	helphtml.obj &
+	helpwxht.obj &
 	helpxlp.obj &
 	imaglist.obj &
 	listctrl.obj &
@@ -63,22 +87,33 @@ NONESSENTIALOBJS= colrdlgg.obj &
 	notebook.obj &
 	printps.obj &
 	prntdlgg.obj &
-	treectrl.obj
+	statline.obj &
+	treectlg.obj
 
 COMMONOBJS = &
 	y_tab.obj &
+	appcmn.obj &
+	choiccmn.obj &
+	clipcmn.obj &
+	cmdline.obj &
 	cmndata.obj &
 	config.obj &
-	date.obj &
+	ctrlcmn.obj &
+	ctrlsub.obj &
+	datetime.obj &
 	datstrm.obj &
 	db.obj &
 	dbtable.obj &
 	dcbase.obj &
 	dlgcmn.obj &
+	dndcmn.obj &
+	dobjcmn.obj &
 	docmdi.obj &
 	docview.obj &
 	dynarray.obj &
 	dynlib.obj &
+	effects.obj &
+	encconv.obj &
 	event.obj &
 	extended.obj &
 	ffile.obj &
@@ -86,25 +121,38 @@ COMMONOBJS = &
 	fileconf.obj &
 	filefn.obj &
 	filesys.obj &
+	fontcmn.obj &
+	fontmap.obj &
 	framecmn.obj &
 	fs_inet.obj &
+	fs_mem.obj &
 	fs_zip.obj &
 	ftp.obj &
 	gdicmn.obj &
+	geometry.obj &
+	gifdecod.obj &
 	hash.obj &
 	helpbase.obj &
 	http.obj &
+	imagall.obj &
 	imagbmp.obj &
 	image.obj &
 	imaggif.obj &
+	imagjpeg.obj &
+	imagpcx.obj &
 	imagpng.obj &
+	imagpnm.obj &
+	imagtiff.obj &
 	intl.obj &
 	ipcbase.obj &
 	layout.obj &
+	lboxcmn.obj &
 	list.obj &
 	log.obj &
+	longlong.obj &
 	memory.obj &
-	mimetype.obj &
+	menucmn.obj &
+	mimecmn.obj &
 	module.obj &
 	mstream.obj &
 	object.obj &
@@ -114,21 +162,24 @@ COMMONOBJS = &
 	prntbase.obj &
 	process.obj &
 	protocol.obj &
+	quantize.obj &
 	resource.obj &
 	sckaddr.obj &
 	sckfile.obj &
 	sckipc.obj &
 	sckstrm.obj &
+	serbase.obj &
+	sizer.obj &
 	socket.obj &
+	strconv.obj &
 	stream.obj &
 	string.obj &
 	tbarbase.obj &
-	tbarsmpl.obj &
 	textcmn.obj &
 	textfile.obj &
-	time.obj &
 	timercmn.obj &
 	tokenzr.obj &
+	treebase.obj &
 	txtstrm.obj &
 	unzip.obj &
 	url.obj &
@@ -141,7 +192,7 @@ COMMONOBJS = &
 	wincmn.obj &
 	wxchar.obj &
 	wxexpr.obj &
-	zipstream.obj &
+	zipstrm.obj &
 	zstream.obj
 
 MSWOBJS = accel.obj &
@@ -171,32 +222,46 @@ 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 &
 	filedlg.obj &
 	font.obj &
 	fontdlg.obj &
+	fontenum.obj &
+	fontutil.obj &
 	frame.obj &
 	gauge95.obj &
 	gaugemsw.obj &
+	gdiimage.obj &
 	gdiobj.obj &
+	glcanvas.obj &
+	gsocket.obj &
+	gsockmsw.obj &
+	helpchm.obj &
 	helpwin.obj &
 	icon.obj &
+	imaglist.obj &
 	iniconf.obj &
 	joystick.obj &
 	listbox.obj &
+	listctrl.obj &
 	main.obj &
 	mdi.obj &
 	menu.obj &
 	menuitem.obj &
 	metafile.obj &
+	mimetype.obj &
 	minifram.obj &
 	msgdlg.obj &
 	nativdlg.obj &
+	notebook.obj &
 	oleutils.obj &
 	ownerdrw.obj &
 	palette.obj &
@@ -214,6 +279,7 @@ MSWOBJS = accel.obj &
 	slider95.obj &
 	slidrmsw.obj &
 	spinbutt.obj &
+	spinctrl.obj &
 	statbmp.obj &
 	statbox.obj &
 	statbr95.obj &
@@ -227,6 +293,7 @@ MSWOBJS = accel.obj &
 	thread.obj &
 	timer.obj &
 	tooltip.obj &
+	treectrl.obj &
 	utils.obj &
 	utilsexc.obj &
 	uuid.obj &
@@ -265,7 +332,7 @@ accel.obj:     $(MSWDIR)\accel.cpp
 app.obj:     $(MSWDIR)\app.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-automtn.obj:     $(MSWDIR)\automtn.cpp
+automtn.obj:     $(OLEDIR)\automtn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 bitmap.obj:     $(MSWDIR)\bitmap.cpp
@@ -316,7 +383,7 @@ cursor.obj:     $(MSWDIR)\cursor.cpp
 data.obj:     $(MSWDIR)\data.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dataobj.obj:     $(MSWDIR)\dataobj.cpp
+dataobj.obj:     $(OLEDIR)\dataobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dc.obj:     $(MSWDIR)\dc.cpp
@@ -340,22 +407,31 @@ 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) $<
 
 dragimag.obj:     $(MSWDIR)\dragimag.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dropsrc.obj:     $(MSWDIR)\dropsrc.cpp
+dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-droptgt.obj:     $(MSWDIR)\droptgt.cpp
+droptgt.obj:     $(OLEDIR)\droptgt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+enhmeta.obj:     $(MSWDIR)\enhmeta.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
@@ -367,6 +443,12 @@ font.obj:     $(MSWDIR)\font.cpp
 fontdlg.obj:     $(MSWDIR)\fontdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fontenum.obj:     $(MSWDIR)\fontenum.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontutil.obj:     $(MSWDIR)\fontutil.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 frame.obj:     $(MSWDIR)\frame.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -376,15 +458,33 @@ 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) $<
+
+helpchm.obj:     $(MSWDIR)\helpchm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 icon.obj:     $(MSWDIR)\icon.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imaglist.obj:     $(MSWDIR)\imaglist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 iniconf.obj:     $(MSWDIR)\iniconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -394,6 +494,9 @@ joystick.obj:     $(MSWDIR)\joystick.cpp
 listbox.obj:     $(MSWDIR)\listbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+listctrl.obj:     $(MSWDIR)\listctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 main.obj:     $(MSWDIR)\main.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -409,6 +512,9 @@ 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) $<
 
@@ -418,7 +524,10 @@ msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-oleutils.obj:     $(MSWDIR)\oleutils.cpp
+notebook.obj:     $(MSWDIR)\notebook.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+oleutils.obj:     $(OLEDIR)\oleutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
@@ -469,6 +578,9 @@ slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+spinctrl.obj:     $(MSWDIR)\spinctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 statbmp.obj:     $(MSWDIR)\statbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -508,13 +620,16 @@ timer.obj:     $(MSWDIR)\timer.cpp
 tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+treectrl.obj:     $(MSWDIR)\treectrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 utils.obj:     $(MSWDIR)\utils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-uuid.obj:     $(MSWDIR)\uuid.cpp
+uuid.obj:     $(OLEDIR)\uuid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 wave.obj:     $(MSWDIR)\wave.cpp
@@ -531,13 +646,31 @@ xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
 ########################################################
 # Common objects (always compiled)
 
+appcmn.obj:     $(COMMDIR)\appcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+cmdline.obj:     $(COMMDIR)\cmdline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-date.obj:     $(COMMDIR)\date.cpp
+ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 datstrm.obj:     $(COMMDIR)\datstrm.cpp
@@ -555,6 +688,12 @@ dcbase.obj:     $(COMMDIR)\dcbase.cpp
 dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dndcmn.obj:     $(COMMDIR)\dndcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dobjcmn.obj:     $(COMMDIR)\dobjcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 docmdi.obj:     $(COMMDIR)\docmdi.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -567,12 +706,18 @@ dynarray.obj:     $(COMMDIR)\dynarray.cpp
 dynlib.obj:     $(COMMDIR)\dynlib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-event.obj:     $(COMMDIR)\event.cpp
+effects.obj:     $(COMMDIR)\effects.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+encconv.obj:     $(COMMDIR)\encconv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-extended.obj:     $(COMMDIR)\extended.cpp
+event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+extended.obj:     $(COMMDIR)\extended.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
 ffile.obj:     $(COMMDIR)\ffile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -588,12 +733,21 @@ filefn.obj:     $(COMMDIR)\filefn.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontmap.obj:     $(COMMDIR)\fontmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
@@ -603,6 +757,12 @@ ftp.obj:     $(COMMDIR)\ftp.cpp
 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) $<
 
@@ -612,6 +772,9 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagall.obj:     $(COMMDIR)\imagall.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -621,9 +784,21 @@ 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) $<
+
 imagpng.obj:     $(COMMDIR)\imagpng.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagtiff.obj:     $(COMMDIR)\imagtiff.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -633,16 +808,25 @@ ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
 layout.obj:     $(COMMDIR)\layout.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+lboxcmn.obj:     $(COMMDIR)\lboxcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 log.obj:     $(COMMDIR)\log.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+longlong.obj:     $(COMMDIR)\longlong.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 memory.obj:     $(COMMDIR)\memory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mimetype.obj:     $(COMMDIR)\mimetype.cpp
+menucmn.obj:     $(COMMDIR)\menucmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
@@ -672,6 +856,9 @@ process.obj:     $(COMMDIR)\process.cpp
 protocol.obj:     $(COMMDIR)\protocol.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+quantize.obj:     $(COMMDIR)\quantize.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -687,9 +874,18 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+serbase.obj:     $(COMMDIR)\serbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sizer.obj:     $(COMMDIR)\sizer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+strconv.obj:     $(COMMDIR)\strconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -699,30 +895,27 @@ string.obj:     $(COMMDIR)\string.cpp
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 textcmn.obj:     $(COMMDIR)\textcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 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) $<
 
-txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
+treebase.obj:     $(COMMDIR)\treebase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-unzip.obj:     $(COMMDIR)\unzip.cpp
+txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+unzip.obj:     $(COMMDIR)\unzip.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
 url.obj:     $(COMMDIR)\url.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -753,7 +946,7 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zipstream.obj:     $(COMMDIR)\zipstream.cpp
+zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 zstream.obj:     $(COMMDIR)\zstream.cpp
@@ -779,24 +972,39 @@ $(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) $<
 
-extdlgg.obj:     $(GENDIR)\extdlgg.cpp
+dirctrlg.obj:     $(GENDIR)\dirctrlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dragimgg.obj:     $(GENDIR)\dragimgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-gridg.obj:     $(GENDIR)\gridg.cpp
+grid.obj:     $(GENDIR)\grid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gridsel.obj:     $(GENDIR)\gridsel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+logg.obj:     $(GENDIR)\logg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 numdlgg.obj:     $(GENDIR)\numdlgg.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) $<
 
@@ -815,6 +1023,9 @@ sashwin.obj:     $(GENDIR)\sashwin.cpp
 scrolwin.obj:     $(GENDIR)\scrolwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+splash.obj:     $(GENDIR)\splash.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -824,12 +1035,21 @@ statusbr.obj:     $(GENDIR)\statusbr.cpp
 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+treelay.obj:     $(GENDIR)\treelay.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wizard.obj:     $(GENDIR)\wizard.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 
 
 crbuffri.obj: $(XPMDIR)\crbuffri.c
@@ -978,8 +1198,28 @@ 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
-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