X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6244848856584171db8cd74a7ff227250e46cc54..a1665b22b07c572a240f9d83783044e3e4f9cb0e:/src/msw/makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 9f95b89490..725af9a4db 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,8 +1,16 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
+
 #!/binb/wmake.exe
+
 #
-# File:		makefile.wat
-# Author:	Julian Smart
-# Created:	1998
+# File:     makefile.wat
+# Author:   Julian Smart
+# Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 
@@ -16,9 +24,8 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = # wxxpm
-EXTRATARGETSCLEAN = # clean_wxxpm
-
+EXTRATARGETS = xpm png zlib
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
@@ -27,209 +34,228 @@ MSWDIR=$(WXDIR)\src\msw
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= choicdgg.obj &
-  gridg.obj &
-  laywin.obj &
-  panelg.obj &
-  sashwin.obj &
-  scrolwin.obj &
-  splitter.obj &
-  statusbr.obj &
-  tabg.obj &
-  textdlgg.obj
+GENERICOBJS= busyinfo.obj &
+	choicdgg.obj &
+	extdlgg.obj &
+	gridg.obj &
+	laywin.obj &
+	panelg.obj &
+	progdlgg.obj &
+	prop.obj &
+	propform.obj &
+	proplist.obj &
+	sashwin.obj &
+	scrolwin.obj &
+	splitter.obj &
+	tabg.obj &
+	textdlgg.obj &
+	tipdlg.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= printps.obj &
-  prntdlgg.obj &
-  msgdlgg.obj &
-  helpxlp.obj &
-  colrdlgg.obj &
-  fontdlgg.obj &
-  postscrp.obj
-
-COMMONOBJS = cmndata.obj &
-  config.obj &
-  docview.obj &
-  docmdi.obj &
-  dynarray.obj &
-  dynlib.obj &
-  event.obj &
-  file.obj &
-  filefn.obj &
-  fileconf.obj &
-  framecmn.obj &
-  gdicmn.obj &
-  image.obj &
-  intl.obj &
-  ipcbase.obj &
-  helpbase.obj &
-  layout.obj &
-  log.obj &
-  memory.obj &
-  module.obj &
-  object.obj &
-  prntbase.obj &
-  resource.obj &
-  tbarbase.obj &
-  tbarsmpl.obj &
-  textfile.obj &
-  timercmn.obj &
-  utilscmn.obj &
-  validate.obj &
-  valtext.obj &
-  date.obj &
-  hash.obj &
-  list.obj &
-  string.obj &
-  socket.obj &
-  sckaddr.obj &
-  sckfile.obj &
-  sckipc.obj &
-  sckstrm.obj &
-  url.obj &
-  http.obj &
-  protocol.obj &
-  time.obj &
-  tokenzr.obj &
-  wxexpr.obj &
-  y_tab.obj &
-  extended.obj &
-  process.obj &
-  wfstream.obj &
-  mstream.obj &
-  zstream.obj &
-  stream.obj &
-  datstrm.obj &
-  objstrm.obj &
-  variant.obj &
-  wincmn.obj
-
-# Can't compile these yet under Watcom C++
-#  odbc.obj &
-#  db.obj &
-#  dbtable.obj &
-
-MSWOBJS1 = &
-  accel.obj &
-  app.obj &
-  bitmap.obj &
-  bmpbuttn.obj &
-  brush.obj &
-  button.obj &
-  checkbox.obj &
-  checklst.obj &
-  choice.obj &
-  clipbrd.obj &
-  colordlg.obj &
-  colour.obj &
-  combobox.obj &
-  control.obj &
-  curico.obj &
-  cursor.obj &
-  data.obj &
-  dc.obj &
-  dcmemory.obj &
-  dcclient.obj &
-  dcprint.obj &
-  dcscreen.obj &
-  dde.obj &
-  dialog.obj &
-  dib.obj &
-  dibutils.obj &
-  dirdlg.obj &
-  filedlg.obj &
-  font.obj &
-  fontdlg.obj &
-  frame.obj &
-  gauge95.obj &
-  gaugemsw.obj &
-  gdiobj.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 &
-  minifram.obj &
-  msgdlg.obj &
-  nativdlg.obj &
-  notebook.obj &
-  ownerdrw.obj &
-  palette.obj &
-  pen.obj &
-  penwin.obj &
-  pnghand.obj &
-  printdlg.obj &
-  printwin.obj &
-  radiobox.obj &
-  radiobut.obj &
-  region.obj &
-  registry.obj &
-  regconf.obj &
-  scrolbar.obj &
-  settings.obj &
-  slidrmsw.obj &
-  slider95.obj &
-  spinbutt.obj &
-  statbmp.obj &
-  statbox.obj &
-  statbr95.obj &
-  stattext.obj &
-  tabctrl.obj &
-  taskbar.obj &
-  tbar95.obj &
-  tbarmsw.obj &
-  textctrl.obj &
-  thread.obj &
-  timer.obj &
-  treectrl.obj &
-  utils.obj &
-  utilsexc.obj &
-  wave.obj &
-  window.obj &
-
-OLEOBJS = &
-  droptgt.obj &
-  dropsrc.obj &
-  dataobj.obj &
-  oleutils.obj &
-  uuid.obj &
-  automtn.obj
-
-XPMOBJECTS = 	crbuffri.obj&
-		crdatfri.obj&
-		create.obj crifrbuf.obj&
-		crifrdat.obj&
-		data.obj&
-		hashtab.obj misc.obj&
-		parse.obj rdftodat.obj&
-		rdftoi.obj&
-		rgb.obj scan.obj&
-		simx.obj wrffrdat.obj&
-		wrffrp.obj wrffri.obj
+NONESSENTIALOBJS= colrdlgg.obj &
+	dirdlgg.obj &
+	fontdlgg.obj &
+	helpxlp.obj &
+	imaglist.obj &
+	listctrl.obj &
+	msgdlgg.obj &
+	notebook.obj &
+	printps.obj &
+	prntdlgg.obj &
+	statusbr.obj &
+	treectrl.obj
+
+COMMONOBJS = &
+	y_tab.obj &
+	extended.obj &
+	cmndata.obj &
+	config.obj &
+	date.obj &
+	datstrm.obj &
+	db.obj &
+	dbtable.obj &
+	dcbase.obj &
+	dlgcmn.obj &
+	docmdi.obj &
+	docview.obj &
+	dynarray.obj &
+	dynlib.obj &
+	event.obj &
+	file.obj &
+	fileconf.obj &
+	filefn.obj &
+	filesys.obj &
+	framecmn.obj &
+	fs_inet.obj &
+	fs_zip.obj &
+	ftp.obj &
+	gdicmn.obj &
+	hash.obj &
+	helpbase.obj &
+	http.obj &
+	imagbmp.obj &
+	image.obj &
+	imaggif.obj &
+	imagpng.obj &
+	intl.obj &
+	ipcbase.obj &
+	layout.obj &
+	list.obj &
+	log.obj &
+	memory.obj &
+	mimetype.obj &
+	module.obj &
+	mstream.obj &
+	object.obj &
+	objstrm.obj &
+	odbc.obj &
+	paper.obj &
+	prntbase.obj &
+	process.obj &
+	protocol.obj &
+	resource.obj &
+	sckaddr.obj &
+	sckfile.obj &
+	sckint.obj &
+	sckipc.obj &
+	sckstrm.obj &
+	socket.obj &
+	stream.obj &
+	string.obj &
+	tbarbase.obj &
+	tbarsmpl.obj &
+	textfile.obj &
+	time.obj &
+	timercmn.obj &
+	tokenzr.obj &
+	txtstrm.obj &
+	unzip.obj &
+	url.obj &
+	utilscmn.obj &
+	valgen.obj &
+	validate.obj &
+	valtext.obj &
+	variant.obj &
+	wfstream.obj &
+	wincmn.obj &
+	wxchar.obj &
+	wxexpr.obj &
+	zipstream.obj &
+	zstream.obj
+
+MSWOBJS = accel.obj &
+	app.obj &
+	automtn.obj &
+	bitmap.obj &
+	bmpbuttn.obj &
+	brush.obj &
+	button.obj &
+	caret.obj &
+	checkbox.obj &
+	checklst.obj &
+	choice.obj &
+	clipbrd.obj &
+	colordlg.obj &
+	colour.obj &
+	combobox.obj &
+	control.obj &
+	curico.obj &
+	cursor.obj &
+	data.obj &
+	dataobj.obj &
+	dc.obj &
+	dcclient.obj &
+	dcmemory.obj &
+	dcprint.obj &
+	dcscreen.obj &
+	dde.obj &
+	dialog.obj &
+	dib.obj &
+	dibutils.obj &
+	dirdlg.obj &
+	dragimag.obj &
+	dropsrc.obj &
+	droptgt.obj &
+	filedlg.obj &
+	font.obj &
+	fontdlg.obj &
+	frame.obj &
+	gauge95.obj &
+	gaugemsw.obj &
+	gdiobj.obj &
+	helpwin.obj &
+	icon.obj &
+	iniconf.obj &
+	joystick.obj &
+	listbox.obj &
+	main.obj &
+	mdi.obj &
+	menu.obj &
+	menuitem.obj &
+	metafile.obj &
+	minifram.obj &
+	msgdlg.obj &
+	nativdlg.obj &
+	oleutils.obj &
+	ownerdrw.obj &
+	palette.obj &
+	pen.obj &
+	penwin.obj &
+	printdlg.obj &
+	printwin.obj &
+	radiobox.obj &
+	radiobut.obj &
+	regconf.obj &
+	region.obj &
+	registry.obj &
+	scrolbar.obj &
+	settings.obj &
+	slider95.obj &
+	slidrmsw.obj &
+	spinbutt.obj &
+	statbmp.obj &
+	statbox.obj &
+	statbr95.obj &
+	statline.obj &
+	stattext.obj &
+	tabctrl.obj &
+	taskbar.obj &
+	tbar95.obj &
+	tbarmsw.obj &
+	textctrl.obj &
+	thread.obj &
+	timer.obj &
+	tooltip.obj &
+	utils.obj &
+	utilsexc.obj &
+	uuid.obj &
+	wave.obj &
+	window.obj &
+	xpmhand.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
-all:        $(OBJECTS) $(LIBTARGET)
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
     @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
     wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+#test : $(OBJECTS)
+#    %create tmp.lbc
+#    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+#    wlib /b /c /n /p=512 $^@ @tmp.lbc
+	
 	
-clean:   .SYMBOLIC
+clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)
     -erase *.pch
     -erase *.err
+    -erase *.lbc
 
 cleanall:   clean
 
@@ -239,6 +265,9 @@ accel.obj:     $(MSWDIR)\accel.cpp
 app.obj:     $(MSWDIR)\app.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+automtn.obj:     $(MSWDIR)\automtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bitmap.obj:     $(MSWDIR)\bitmap.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -251,7 +280,7 @@ brush.obj:     $(MSWDIR)\brush.cpp
 button.obj:     $(MSWDIR)\button.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-choice.obj:     $(MSWDIR)\choice.cpp
+caret.obj:     $(MSWDIR)\caret.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 checkbox.obj:     $(MSWDIR)\checkbox.cpp
@@ -260,6 +289,9 @@ checkbox.obj:     $(MSWDIR)\checkbox.cpp
 checklst.obj:     $(MSWDIR)\checklst.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+choice.obj:     $(MSWDIR)\choice.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 clipbrd.obj:     $(MSWDIR)\clipbrd.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -284,16 +316,16 @@ cursor.obj:     $(MSWDIR)\cursor.cpp
 data.obj:     $(MSWDIR)\data.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dde.obj:     $(MSWDIR)\dde.cpp
+dataobj.obj:     $(MSWDIR)\dataobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dc.obj:     $(MSWDIR)\dc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
+dcclient.obj:     $(MSWDIR)\dcclient.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcclient.obj:     $(MSWDIR)\dcclient.cpp
+dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dcprint.obj:     $(MSWDIR)\dcprint.cpp
@@ -302,6 +334,9 @@ dcprint.obj:     $(MSWDIR)\dcprint.cpp
 dcscreen.obj:     $(MSWDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dde.obj:     $(MSWDIR)\dde.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dialog.obj:     $(MSWDIR)\dialog.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -314,6 +349,15 @@ dibutils.obj:     $(MSWDIR)\dibutils.cpp
 dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dragimag.obj:     $(MSWDIR)\dragimag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dropsrc.obj:     $(MSWDIR)\dropsrc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+droptgt.obj:     $(MSWDIR)\droptgt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -335,10 +379,13 @@ gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
 gdiobj.obj:     $(MSWDIR)\gdiobj.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
+iniconf.obj:     $(MSWDIR)\iniconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 joystick.obj:     $(MSWDIR)\joystick.cpp
@@ -347,9 +394,6 @@ 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) $<
 
@@ -374,7 +418,7 @@ msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-notebook.obj:     $(MSWDIR)\notebook.cpp
+oleutils.obj:     $(MSWDIR)\oleutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
@@ -389,9 +433,6 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-pnghand.obj:     $(MSWDIR)\pnghand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 printdlg.obj:     $(MSWDIR)\printdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -404,13 +445,13 @@ radiobox.obj:     $(MSWDIR)\radiobox.cpp
 radiobut.obj:     $(MSWDIR)\radiobut.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-region.obj:     $(MSWDIR)\region.cpp
+regconf.obj:     $(MSWDIR)\regconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-registry.obj:     $(MSWDIR)\registry.cpp
+region.obj:     $(MSWDIR)\region.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-regconf.obj:     $(MSWDIR)\regconf.cpp
+registry.obj:     $(MSWDIR)\registry.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
@@ -419,10 +460,10 @@ scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
 settings.obj:     $(MSWDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
+slider95.obj:     $(MSWDIR)\slider95.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-slider95.obj:     $(MSWDIR)\slider95.cpp
+slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
@@ -437,6 +478,9 @@ statbox.obj:     $(MSWDIR)\statbox.cpp
 statbr95.obj:     $(MSWDIR)\statbr95.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+statline.obj:     $(MSWDIR)\statline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 stattext.obj:     $(MSWDIR)\stattext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -444,7 +488,6 @@ tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 taskbar.obj:     $(MSWDIR)\taskbar.cpp
-        cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tbar95.obj:     $(MSWDIR)\tbar95.cpp
@@ -462,8 +505,7 @@ thread.obj:     $(MSWDIR)\thread.cpp
 timer.obj:     $(MSWDIR)\timer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-treectrl.obj:     $(MSWDIR)\treectrl.cpp
-        cl @<<
+tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 utils.obj:     $(MSWDIR)\utils.cpp
@@ -472,29 +514,19 @@ utils.obj:     $(MSWDIR)\utils.cpp
 utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wave.obj:     $(MSWDIR)\wave.cpp
+uuid.obj:     $(MSWDIR)\uuid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-window.obj:     $(MSWDIR)\window.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-droptgt.obj:     $(OLEDIR)\droptgt.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
+wave.obj:     $(MSWDIR)\wave.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dataobj.obj:     $(OLEDIR)\dataobj.cpp
+window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-oleutils.obj:     $(OLEDIR)\oleutils.cpp
+xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-uuid.obj:     $(OLEDIR)\uuid.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-automtn.obj:     $(OLEDIR)\automtn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ########################################################
 # Common objects (always compiled)
@@ -505,18 +537,30 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+date.obj:     $(COMMDIR)\date.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datstrm.obj:     $(COMMDIR)\datstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 db.obj:     $(COMMDIR)\db.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dbtable.obj:     $(COMMDIR)\dbtable.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-docview.obj:     $(COMMDIR)\docview.cpp
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 docmdi.obj:     $(COMMDIR)\docmdi.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+docview.obj:     $(COMMDIR)\docview.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -535,88 +579,94 @@ fileconf.obj:     $(COMMDIR)\fileconf.cpp
 filefn.obj:     $(COMMDIR)\filefn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+filesys.obj:     $(COMMDIR)\filesys.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
+fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-image.obj:     $(COMMDIR)\image.cpp
+fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-intl.obj:     $(COMMDIR)\intl.cpp
+ftp.obj:     $(COMMDIR)\ftp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
+gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 helpbase.obj:     $(COMMDIR)\helpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-layout.obj:     $(COMMDIR)\layout.cpp
+http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-log.obj:     $(COMMDIR)\log.cpp
+imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-memory.obj:     $(COMMDIR)\memory.cpp
+image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-module.obj:     $(COMMDIR)\module.cpp
+imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-object.obj:     $(COMMDIR)\object.cpp
+imagpng.obj:     $(COMMDIR)\imagpng.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-odbc.obj:     $(COMMDIR)\odbc.cpp
+intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-postscrp.obj:     $(COMMDIR)\postcrp.cpp
+ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prntbase.obj:     $(COMMDIR)\prntbase.cpp
+layout.obj:     $(COMMDIR)\layout.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-resource.obj:     $(COMMDIR)\resource.cpp
+list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
+log.obj:     $(COMMDIR)\log.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
+memory.obj:     $(COMMDIR)\memory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-textfile.obj:     $(COMMDIR)\textfile.cpp
+mimetype.obj:     $(COMMDIR)\mimetype.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-timercmn.obj:     $(COMMDIR)\timercmn.cpp
+module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
+mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-validate.obj:     $(COMMDIR)\validate.cpp
+object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-valtext.obj:     $(COMMDIR)\valtext.cpp
+objstrm.obj:     $(COMMDIR)\objstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-date.obj:     $(COMMDIR)\date.cpp
+odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-hash.obj:     $(COMMDIR)\hash.cpp
+prntbase.obj:     $(COMMDIR)\prntbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-list.obj:     $(COMMDIR)\list.cpp
+process.obj:     $(COMMDIR)\process.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-string.obj:     $(COMMDIR)\string.cpp
+protocol.obj:     $(COMMDIR)\protocol.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-socket.obj:     $(COMMDIR)\socket.cpp
+resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
@@ -625,60 +675,89 @@ sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
 sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-url.obj:     $(COMMDIR)\url.cpp
+socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-http.obj:     $(COMMDIR)\http.cpp
+stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-protocol.obj:     $(COMMDIR)\protocol.cpp
+string.obj:     $(COMMDIR)\string.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
+tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-matrix.obj:     $(COMMDIR)\matrix.cpp
+textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 time.obj:     $(COMMDIR)\time.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-stream.obj:     $(COMMDIR)\stream.cpp
+timercmn.obj:     $(COMMDIR)\timercmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wfstream.obj:     $(COMMDIR)\wfstream.cpp
+tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mstream.obj:     $(COMMDIR)\mstream.cpp
+txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zstream.obj:     $(COMMDIR)\zstream.cpp
+unzip.obj:     $(COMMDIR)\unzip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-datstrm.obj:     $(COMMDIR)\datstrm.cpp
+url.obj:     $(COMMDIR)\url.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
+utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
+valgen.obj:     $(COMMDIR)\valgen.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-process.obj:     $(COMMDIR)\process.cpp
+validate.obj:     $(COMMDIR)\validate.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+valtext.obj:     $(COMMDIR)\valtext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 variant.obj:     $(COMMDIR)\variant.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+wfstream.obj:     $(COMMDIR)\wfstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 wincmn.obj:     $(COMMDIR)\wincmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+wxchar.obj:     $(COMMDIR)\wxchar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zipstream.obj:     $(COMMDIR)\zipstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zstream.obj:     $(COMMDIR)\zstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+
+
+extended.obj:     $(COMMDIR)\extended.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
+
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
@@ -694,34 +773,34 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
-choicdgg.obj:     $(GENDIR)\choicdgg.cpp
+busyinfo.obj:     $(GENDIR)\busyinfo.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-colrdlgg.obj:     $(GENDIR)\colrdgg.cpp
+choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
+extdlgg.obj:     $(GENDIR)\extdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpxlp.obj:     $(GENDIR)\helpxlp.cpp
+laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-laywin.obj:     $(GENDIR)\laywin.cpp
+panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-panelg.obj:     $(GENDIR)\panelg.cpp
+prop.obj:     $(GENDIR)\prop.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-printps.obj:     $(GENDIR)\printps.cpp
+propform.obj:     $(GENDIR)\propform.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
+proplist.obj:     $(GENDIR)\proplist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sashwin.obj:     $(GENDIR)\sashwin.cpp
@@ -733,15 +812,17 @@ scrolwin.obj:     $(GENDIR)\scrolwin.cpp
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-statusbr.obj:     $(GENDIR)\statusbr.cpp
+tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tabg.obj:     $(GENDIR)\tabg.cpp
+textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-textdlgg.obj: $(GENDIR)\textdlgg.cpp
+tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+
+
 crbuffri.obj: $(XPMDIR)\crbuffri.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -809,15 +890,82 @@ wrffri.obj: $(XPMDIR)\wrffri.c
 wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(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) 
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+	$(CC) -c $(CFLAGS) $*.c
+
+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
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+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
+    cd $(WXDIR)\src\msw
 
-#wxxpm:   .SYMBOLIC
-#    cd $(WXDIR)\contrib\wxxpm
-#    wmake -f makefile.wat all
-#    cd $(WXDIR)\src\msw
+clean_png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
 
-#clean_wxxpm:   .SYMBOLIC
-#    cd $(WXDIR)\contrib\wxxpm
-#    wmake -f makefile.wat clean
-#    cd $(WXDIR)\src\msw
+zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
 
+clean_zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw