X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b037754f53cc35e177bf6787bace26c7cecc6e1..0655ad290a99dc0d4e8ea86aec60c7833a53be53:/src/msw/makefile.g95?ds=sidebyside

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index b98ea796ee..b5a2bbec48 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,294 +1,387 @@
+
+
+# This file was automatically generated by tmake at 00:42, 1999/07/27
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
+
 #
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "@(#)makefile.unx	1.2 5/9/94"
+# File:     makefile.g95
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
 #
 # Makefile for libwx.a
 
 # Replace this with your own path if necessary
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
+# All common compiler flags and options are now in
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-# IMPORTANT: if you want to link in subsidiary libraries,
-# required for some optional parts of wxWindows, you must
-# set EXTRATARGETS and EXTRAOBJS to match the settings in wx_setup.h.
-# Having done this, you won't have to worry about linking them
-# into each application.
-#
-# Here's the full list.
-#   prologio: Required if using the wxWindows resource facility
-#               USE_WX_RESOURCES should be 1
-#   xmgauge:  Gauge class (required for Motif only)
-#               USE_GAUGE should be 1
-#   xpm:      XPM pixmap support
-#               USE_XPM_IN_X should be 1
-#   image:    GIF, BMP image reading
-#               USE_IMAGE_LOADING_IN_X should be 1
-#   wxstring: string class
-#               USE_GNU_WXSTRING should be 1
-#
-# Unfortunately, 'ar' doesn't like combining objects and libraries,
-# so we must identify all the objects from the subordinate libraries. Yuck!
-XPMSRC=../../contrib/wxxpm/objects$(GUISUFFIX)
-XPMOBJS=$(XPMSRC)/crbuffri.$(OBJSUFF) $(XPMSRC)/crbuffrp.$(OBJSUFF) $(XPMSRC)/crdatfri.$(OBJSUFF) $(XPMSRC)/crdatfrp.$(OBJSUFF)\
-  $(XPMSRC)/create.$(OBJSUFF) $(XPMSRC)/crifrbuf.$(OBJSUFF) $(XPMSRC)/crifrdat.$(OBJSUFF) $(XPMSRC)/crpfrbuf.$(OBJSUFF) $(XPMSRC)/crpfrdat.$(OBJSUFF)\
-  $(XPMSRC)/data.$(OBJSUFF) $(XPMSRC)/hashtab.$(OBJSUFF) $(XPMSRC)/misc.$(OBJSUFF) $(XPMSRC)/parse.$(OBJSUFF) $(XPMSRC)/rdftodat.$(OBJSUFF)\
-  $(XPMSRC)/rdftoi.$(OBJSUFF) $(XPMSRC)/rdftop.$(OBJSUFF) $(XPMSRC)/rgb.$(OBJSUFF) $(XPMSRC)/scan.$(OBJSUFF) $(XPMSRC)/simx.$(OBJSUFF)\
-  $(XPMSRC)/wrffrdat.$(OBJSUFF) $(XPMSRC)/wrffri.$(OBJSUFF) $(XPMSRC)/wrffrp.$(OBJSUFF)
-
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
-GENDIR=../generic
-COMMDIR=../common
-OLEDIR=ole
-MSWDIR=.
-
-GENERICOBJDIR=../generic/$(OBJDIR)
-COMMOBJDIR=../common/$(OBJDIR)
-OLEOBJDIR=ole/$(OBJDIR)
-MSWDIR=$(OBJDIR)
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= \
-  $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
-  $(GENDIR)/gridg.$(OBJSUFF) \
-  $(GENDIR)/laywin.$(OBJSUFF) \
-  $(GENDIR)/msgdlgg.$(OBJSUFF) \
-  $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
-  $(GENDIR)/sashwin.$(OBJSUFF) \
-  $(GENDIR)/scrolwin.$(OBJSUFF) \
-  $(GENDIR)/splitter.$(OBJSUFF) \
-  $(GENDIR)/statusbr.$(OBJSUFF) \
-  $(GENDIR)/tabg.$(OBJSUFF) \
-  $(GENDIR)/textdlgg.$(OBJSUFF)
-
-COMMONOBJS = \
-  $(COMMDIR)/config.$(OBJSUFF) \
-  $(COMMDIR)/cmndata.$(OBJSUFF) \
-  $(COMMDIR)/docview.$(OBJSUFF) \
-  $(COMMDIR)/docmdi.$(OBJSUFF) \
-  $(COMMDIR)/dynarray.$(OBJSUFF) \
-  $(COMMDIR)/event.$(OBJSUFF) \
-  $(COMMDIR)/file.$(OBJSUFF) \
-  $(COMMDIR)/fileconf.$(OBJSUFF) \
-  $(COMMDIR)/filefn.$(OBJSUFF) \
-  $(COMMDIR)/framecmn.$(OBJSUFF) \
-  $(COMMDIR)/gdicmn.$(OBJSUFF) \
-  $(COMMDIR)/helpbase.$(OBJSUFF) \
-  $(COMMDIR)/intl.$(OBJSUFF) \
-  $(COMMDIR)/layout.$(OBJSUFF) \
-  $(COMMDIR)/log.$(OBJSUFF) \
-  $(COMMDIR)/memory.$(OBJSUFF) \
-  $(COMMDIR)/module.$(OBJSUFF) \
-  $(COMMDIR)/object.$(OBJSUFF) \
-  $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
-  $(COMMDIR)/process.$(OBJSUFF) \
-  $(COMMDIR)/prntbase.$(OBJSUFF) \
-  $(COMMDIR)/resource.$(OBJSUFF) \
-  $(COMMDIR)/tbarbase.$(OBJSUFF) \
-  $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
-  $(COMMDIR)/textfile.$(OBJSUFF) \
-  $(COMMDIR)/timercmn.$(OBJSUFF) \
-  $(COMMDIR)/utilscmn.$(OBJSUFF) \
-  $(COMMDIR)/validate.$(OBJSUFF) \
-  $(COMMDIR)/valtext.$(OBJSUFF) \
-  $(COMMDIR)/date.$(OBJSUFF) \
-  $(COMMDIR)/wxexpr.$(OBJSUFF) \
-  $(COMMDIR)/hash.$(OBJSUFF) \
-  $(COMMDIR)/list.$(OBJSUFF) \
-  $(COMMDIR)/variant.$(OBJSUFF) \
-  $(COMMDIR)/string.$(OBJSUFF) \
-  $(COMMDIR)/time.$(OBJSUFF) \
-  $(COMMDIR)/tokenzr.$(OBJSUFF) \
-  $(COMMDIR)/y_tab.$(OBJSUFF) \
-  $(COMMDIR)/stream.$(OBJSUFF) \
-  $(COMMDIR)/wfstream.$(OBJSUFF) \
-  $(COMMDIR)/mstream.$(OBJSUFF) \
-  $(COMMDIR)/zstream.$(OBJSUFF) \
-  $(COMMDIR)/datstrm.$(OBJSUFF) \
-  $(COMMDIR)/objstrm.$(OBJSUFF) \
-  $(COMMDIR)/extended.$(OBJSUFF) \
-  $(COMMDIR)/socket.$(OBJSUFF) \
-  $(COMMDIR)/sckaddr.$(OBJSUFF) \
-  $(COMMDIR)/sckfile.$(OBJSUFF) \
-  $(COMMDIR)/sckipc.$(OBJSUFF) \
-  $(COMMDIR)/sckstrm.$(OBJSUFF) \
-  $(COMMDIR)/protocol.$(OBJSUFF) \
-  $(COMMDIR)/http.$(OBJSUFF) \
-  $(COMMDIR)/ftp.$(OBJSUFF) \
-  $(COMMDIR)/url.$(OBJSUFF) \
-  $(COMMDIR)/wincmn.$(OBJSUFF)
-
-# This must be renamed! It conflicts with the g++ fstream.h.
-#  $(COMMDIR)/fstream.$(OBJSUFF) \
-
-# NOTE: if the socket-related files above fail with a syntax error in Sockets.h,
-# remove the files (probably all GnuWin32 releases < b20).
-
-MSWOBJS = \
-  accel.$(OBJSUFF) \
-  app.$(OBJSUFF) \
-  bitmap.$(OBJSUFF) \
-  bmpbuttn.$(OBJSUFF) \
-  brush.$(OBJSUFF) \
-  button.$(OBJSUFF) \
-  checkbox.$(OBJSUFF) \
-  checklst.$(OBJSUFF) \
-  choice.$(OBJSUFF) \
-  clipbrd.$(OBJSUFF) \
-  colordlg.$(OBJSUFF) \
-  colour.$(OBJSUFF) \
-  combobox.$(OBJSUFF) \
-  control.$(OBJSUFF) \
-  curico.$(OBJSUFF) \
-  cursor.$(OBJSUFF) \
-  data.$(OBJSUFF) \
-  dc.$(OBJSUFF) \
-  dcmemory.$(OBJSUFF) \
-  dcclient.$(OBJSUFF) \
-  dcprint.$(OBJSUFF) \
-  dcscreen.$(OBJSUFF) \
-  dde.$(OBJSUFF) \
-  dialog.$(OBJSUFF) \
-  dib.$(OBJSUFF) \
-  dirdlg.$(OBJSUFF) \
-  filedlg.$(OBJSUFF) \
-  font.$(OBJSUFF) \
-  fontdlg.$(OBJSUFF) \
-  frame.$(OBJSUFF) \
-  gaugemsw.$(OBJSUFF) \
-  gauge95.$(OBJSUFF) \
-  gdiobj.$(OBJSUFF) \
-  helpwin.$(OBJSUFF) \
-  icon.$(OBJSUFF) \
-  imaglist.$(OBJSUFF) \
-  joystick.$(OBJSUFF) \
-  listbox.$(OBJSUFF) \
-  listctrl.$(OBJSUFF) \
-  main.$(OBJSUFF) \
-  mdi.$(OBJSUFF) \
-  menu.$(OBJSUFF) \
-  menuitem.$(OBJSUFF) \
-  metafile.$(OBJSUFF) \
-  minifram.$(OBJSUFF) \
-  msgdlg.$(OBJSUFF) \
-  nativdlg.$(OBJSUFF) \
-  notebook.$(OBJSUFF) \
-  ownerdrw.$(OBJSUFF) \
-  palette.$(OBJSUFF) \
-  pen.$(OBJSUFF) \
-  penwin.$(OBJSUFF) \
-  printdlg.$(OBJSUFF) \
-  printwin.$(OBJSUFF) \
-  radiobox.$(OBJSUFF) \
-  radiobut.$(OBJSUFF) \
-  region.$(OBJSUFF) \
-  registry.$(OBJSUFF) \
-  regconf.$(OBJSUFF) \
-  scrolbar.$(OBJSUFF) \
-  settings.$(OBJSUFF) \
-  slidrmsw.$(OBJSUFF) \
-  slider95.$(OBJSUFF) \
-  spinbutt.$(OBJSUFF) \
-  statbmp.$(OBJSUFF) \
-  statbox.$(OBJSUFF) \
-  statbr95.$(OBJSUFF) \
-  stattext.$(OBJSUFF) \
-  tabctrl.$(OBJSUFF) \
-  taskbar.$(OBJSUFF) \
-  tbar95.$(OBJSUFF) \
-  tbarmsw.$(OBJSUFF) \
-  textctrl.$(OBJSUFF) \
-  thread.$(OBJSUFF) \
-  timer.$(OBJSUFF) \
-  treectrl.$(OBJSUFF) \
-  utils.$(OBJSUFF) \
-  utilsexc.$(OBJSUFF) \
-  wave.$(OBJSUFF) \
-  window.$(OBJSUFF)
-
-# OLE not supported yet by GnuWin32 (?)
-#  $(OLEDIR)/droptgt.$(OBJSUFF) \
-#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-#  $(OLEDIR)/dataobj.$(OBJSUFF) \
-#  $(OLEDIR)/oleutils.$(OBJSUFF) \
-#  $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+GENERICOBJS = \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
+		$(GENDIR)/choicdgg.$(OBJSUFF) \
+		$(GENDIR)/dirdlgg.$(OBJSUFF) \
+		$(GENDIR)/extdlgg.$(OBJSUFF) \
+		$(GENDIR)/gridg.$(OBJSUFF) \
+		$(GENDIR)/laywin.$(OBJSUFF) \
+		$(GENDIR)/numdlgg.$(OBJSUFF) \
+		$(GENDIR)/panelg.$(OBJSUFF) \
+		$(GENDIR)/progdlgg.$(OBJSUFF) \
+		$(GENDIR)/prop.$(OBJSUFF) \
+		$(GENDIR)/propform.$(OBJSUFF) \
+		$(GENDIR)/proplist.$(OBJSUFF) \
+		$(GENDIR)/sashwin.$(OBJSUFF) \
+		$(GENDIR)/scrolwin.$(OBJSUFF) \
+		$(GENDIR)/splitter.$(OBJSUFF) \
+		$(GENDIR)/statusbr.$(OBJSUFF) \
+		$(GENDIR)/tabg.$(OBJSUFF) \
+		$(GENDIR)/textdlgg.$(OBJSUFF) \
+		$(GENDIR)/tipdlg.$(OBJSUFF)
+
+COMMONOBJS  = \
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/choiccmn.$(OBJSUFF) \
+		$(COMMDIR)/cmndata.$(OBJSUFF) \
+		$(COMMDIR)/config.$(OBJSUFF) \
+		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+		$(COMMDIR)/date.$(OBJSUFF) \
+		$(COMMDIR)/datstrm.$(OBJSUFF) \
+		$(COMMDIR)/db.$(OBJSUFF) \
+		$(COMMDIR)/dbtable.$(OBJSUFF) \
+		$(COMMDIR)/dcbase.$(OBJSUFF) \
+		$(COMMDIR)/dlgcmn.$(OBJSUFF) \
+		$(COMMDIR)/docmdi.$(OBJSUFF) \
+		$(COMMDIR)/docview.$(OBJSUFF) \
+		$(COMMDIR)/dynarray.$(OBJSUFF) \
+		$(COMMDIR)/dynlib.$(OBJSUFF) \
+		$(COMMDIR)/event.$(OBJSUFF) \
+		$(COMMDIR)/extended.$(OBJSUFF) \
+		$(COMMDIR)/ffile.$(OBJSUFF) \
+		$(COMMDIR)/file.$(OBJSUFF) \
+		$(COMMDIR)/fileconf.$(OBJSUFF) \
+		$(COMMDIR)/filefn.$(OBJSUFF) \
+		$(COMMDIR)/filesys.$(OBJSUFF) \
+		$(COMMDIR)/framecmn.$(OBJSUFF) \
+		$(COMMDIR)/fs_inet.$(OBJSUFF) \
+		$(COMMDIR)/fs_zip.$(OBJSUFF) \
+		$(COMMDIR)/ftp.$(OBJSUFF) \
+		$(COMMDIR)/gdicmn.$(OBJSUFF) \
+		$(COMMDIR)/hash.$(OBJSUFF) \
+		$(COMMDIR)/helpbase.$(OBJSUFF) \
+		$(COMMDIR)/http.$(OBJSUFF) \
+		$(COMMDIR)/imagbmp.$(OBJSUFF) \
+		$(COMMDIR)/image.$(OBJSUFF) \
+		$(COMMDIR)/imaggif.$(OBJSUFF) \
+		$(COMMDIR)/imagjpeg.$(OBJSUFF) \
+		$(COMMDIR)/imagpng.$(OBJSUFF) \
+		$(COMMDIR)/intl.$(OBJSUFF) \
+		$(COMMDIR)/ipcbase.$(OBJSUFF) \
+		$(COMMDIR)/layout.$(OBJSUFF) \
+		$(COMMDIR)/list.$(OBJSUFF) \
+		$(COMMDIR)/log.$(OBJSUFF) \
+		$(COMMDIR)/memory.$(OBJSUFF) \
+		$(COMMDIR)/mimetype.$(OBJSUFF) \
+		$(COMMDIR)/module.$(OBJSUFF) \
+		$(COMMDIR)/mstream.$(OBJSUFF) \
+		$(COMMDIR)/object.$(OBJSUFF) \
+		$(COMMDIR)/objstrm.$(OBJSUFF) \
+		$(COMMDIR)/paper.$(OBJSUFF) \
+		$(COMMDIR)/prntbase.$(OBJSUFF) \
+		$(COMMDIR)/process.$(OBJSUFF) \
+		$(COMMDIR)/protocol.$(OBJSUFF) \
+		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/sckaddr.$(OBJSUFF) \
+		$(COMMDIR)/sckfile.$(OBJSUFF) \
+		$(COMMDIR)/sckipc.$(OBJSUFF) \
+		$(COMMDIR)/sckstrm.$(OBJSUFF) \
+		$(COMMDIR)/socket.$(OBJSUFF) \
+		$(COMMDIR)/stream.$(OBJSUFF) \
+		$(COMMDIR)/string.$(OBJSUFF) \
+		$(COMMDIR)/tbarbase.$(OBJSUFF) \
+		$(COMMDIR)/textcmn.$(OBJSUFF) \
+		$(COMMDIR)/textfile.$(OBJSUFF) \
+		$(COMMDIR)/time.$(OBJSUFF) \
+		$(COMMDIR)/timercmn.$(OBJSUFF) \
+		$(COMMDIR)/tokenzr.$(OBJSUFF) \
+		$(COMMDIR)/txtstrm.$(OBJSUFF) \
+		$(COMMDIR)/unzip.$(OBJSUFF) \
+		$(COMMDIR)/url.$(OBJSUFF) \
+		$(COMMDIR)/utilscmn.$(OBJSUFF) \
+		$(COMMDIR)/valgen.$(OBJSUFF) \
+		$(COMMDIR)/validate.$(OBJSUFF) \
+		$(COMMDIR)/valtext.$(OBJSUFF) \
+		$(COMMDIR)/variant.$(OBJSUFF) \
+		$(COMMDIR)/wfstream.$(OBJSUFF) \
+		$(COMMDIR)/wincmn.$(OBJSUFF) \
+		$(COMMDIR)/wxchar.$(OBJSUFF) \
+		$(COMMDIR)/wxexpr.$(OBJSUFF) \
+		$(COMMDIR)/zipstream.$(OBJSUFF) \
+		$(COMMDIR)/zstream.$(OBJSUFF)
+
+MSWOBJS     = \
+		accel.$(OBJSUFF) \
+		app.$(OBJSUFF) \
+		bitmap.$(OBJSUFF) \
+		bmpbuttn.$(OBJSUFF) \
+		brush.$(OBJSUFF) \
+		button.$(OBJSUFF) \
+		caret.$(OBJSUFF) \
+		checkbox.$(OBJSUFF) \
+		checklst.$(OBJSUFF) \
+		choice.$(OBJSUFF) \
+		clipbrd.$(OBJSUFF) \
+		colordlg.$(OBJSUFF) \
+		colour.$(OBJSUFF) \
+		combobox.$(OBJSUFF) \
+		control.$(OBJSUFF) \
+		curico.$(OBJSUFF) \
+		cursor.$(OBJSUFF) \
+		data.$(OBJSUFF) \
+		dc.$(OBJSUFF) \
+		dcclient.$(OBJSUFF) \
+		dcmemory.$(OBJSUFF) \
+		dcprint.$(OBJSUFF) \
+		dcscreen.$(OBJSUFF) \
+		dde.$(OBJSUFF) \
+		dialog.$(OBJSUFF) \
+		dib.$(OBJSUFF) \
+		dibutils.$(OBJSUFF) \
+		dragimag.$(OBJSUFF) \
+		filedlg.$(OBJSUFF) \
+		font.$(OBJSUFF) \
+		fontdlg.$(OBJSUFF) \
+		frame.$(OBJSUFF) \
+		gauge95.$(OBJSUFF) \
+		gdiobj.$(OBJSUFF) \
+		helpwin.$(OBJSUFF) \
+		icon.$(OBJSUFF) \
+		imaglist.$(OBJSUFF) \
+		joystick.$(OBJSUFF) \
+		listbox.$(OBJSUFF) \
+		listctrl.$(OBJSUFF) \
+		main.$(OBJSUFF) \
+		mdi.$(OBJSUFF) \
+		menu.$(OBJSUFF) \
+		menuitem.$(OBJSUFF) \
+		metafile.$(OBJSUFF) \
+		minifram.$(OBJSUFF) \
+		msgdlg.$(OBJSUFF) \
+		nativdlg.$(OBJSUFF) \
+		notebook.$(OBJSUFF) \
+		ownerdrw.$(OBJSUFF) \
+		palette.$(OBJSUFF) \
+		pen.$(OBJSUFF) \
+		penwin.$(OBJSUFF) \
+		pnghand.$(OBJSUFF) \
+		printdlg.$(OBJSUFF) \
+		printwin.$(OBJSUFF) \
+		radiobox.$(OBJSUFF) \
+		radiobut.$(OBJSUFF) \
+		regconf.$(OBJSUFF) \
+		region.$(OBJSUFF) \
+		registry.$(OBJSUFF) \
+		scrolbar.$(OBJSUFF) \
+		settings.$(OBJSUFF) \
+		slider95.$(OBJSUFF) \
+		spinbutt.$(OBJSUFF) \
+		statbmp.$(OBJSUFF) \
+		statbox.$(OBJSUFF) \
+		statbr95.$(OBJSUFF) \
+		statline.$(OBJSUFF) \
+		stattext.$(OBJSUFF) \
+		tabctrl.$(OBJSUFF) \
+		taskbar.$(OBJSUFF) \
+		tbar95.$(OBJSUFF) \
+		textctrl.$(OBJSUFF) \
+		thread.$(OBJSUFF) \
+		timer.$(OBJSUFF) \
+		tooltip.$(OBJSUFF) \
+		treectrl.$(OBJSUFF) \
+		utils.$(OBJSUFF) \
+		utilsexc.$(OBJSUFF) \
+		wave.$(OBJSUFF) \
+		window.$(OBJSUFF) \
+		xpmhand.$(OBJSUFF)
+
+ZLIBOBJS    = \
+		$(ZLIBDIR)/adler32.$(OBJSUFF) \
+		$(ZLIBDIR)/compress.$(OBJSUFF) \
+		$(ZLIBDIR)/crc32.$(OBJSUFF) \
+		$(ZLIBDIR)/gzio.$(OBJSUFF) \
+		$(ZLIBDIR)/uncompr.$(OBJSUFF) \
+		$(ZLIBDIR)/deflate.$(OBJSUFF) \
+		$(ZLIBDIR)/trees.$(OBJSUFF) \
+		$(ZLIBDIR)/zutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inflate.$(OBJSUFF) \
+		$(ZLIBDIR)/infblock.$(OBJSUFF) \
+		$(ZLIBDIR)/inftrees.$(OBJSUFF) \
+		$(ZLIBDIR)/infcodes.$(OBJSUFF) \
+		$(ZLIBDIR)/infutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+		$(PNGDIR)/png.$(OBJSUFF) \
+		$(PNGDIR)/pngread.$(OBJSUFF) \
+		$(PNGDIR)/pngrtran.$(OBJSUFF) \
+		$(PNGDIR)/pngrutil.$(OBJSUFF) \
+		$(PNGDIR)/pngpread.$(OBJSUFF) \
+		$(PNGDIR)/pngtrans.$(OBJSUFF) \
+		$(PNGDIR)/pngwrite.$(OBJSUFF) \
+		$(PNGDIR)/pngwtran.$(OBJSUFF) \
+		$(PNGDIR)/pngwutil.$(OBJSUFF) \
+		$(PNGDIR)/pngerror.$(OBJSUFF) \
+		$(PNGDIR)/pngmem.$(OBJSUFF) \
+		$(PNGDIR)/pngwio.$(OBJSUFF) \
+		$(PNGDIR)/pngrio.$(OBJSUFF) \
+		$(PNGDIR)/pngget.$(OBJSUFF) \
+		$(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+		$(JPEGDIR)/jcomapi.$(OBJSUFF) \
+		$(JPEGDIR)/jutils.$(OBJSUFF) \
+		$(JPEGDIR)/jerror.$(OBJSUFF) \
+		$(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+		$(JPEGDIR)/jcapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jcapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jctrans.$(OBJSUFF) \
+		$(JPEGDIR)/jcparam.$(OBJSUFF) \
+		$(JPEGDIR)/jdatadst.$(OBJSUFF) \
+		$(JPEGDIR)/jcinit.$(OBJSUFF) \
+		$(JPEGDIR)/jcmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jcmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jcmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jcprepct.$(OBJSUFF) \
+		$(JPEGDIR)/jccoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jccolor.$(OBJSUFF) \
+		$(JPEGDIR)/jcsample.$(OBJSUFF) \
+		$(JPEGDIR)/jchuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctint.$(OBJSUFF) \
+		$(JPEGDIR)/jdapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jdapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jdtrans.$(OBJSUFF) \
+		$(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+		$(JPEGDIR)/jdmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jdinput.$(OBJSUFF) \
+		$(JPEGDIR)/jdmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jdhuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jdpostct.$(OBJSUFF) \
+		$(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jidctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jidctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jidctint.$(OBJSUFF) \
+		$(JPEGDIR)/jidctred.$(OBJSUFF) \
+		$(JPEGDIR)/jdsample.$(OBJSUFF) \
+		$(JPEGDIR)/jdcolor.$(OBJSUFF) \
+		$(JPEGDIR)/jquant1.$(OBJSUFF) \
+		$(JPEGDIR)/jquant2.$(OBJSUFF) \
+		$(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+		$(XPMDIR)/crdatfri.o\
+		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/crifrdat.o\
+		$(XPMDIR)/data.o\
+		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/rdftoi.o\
+		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
 
-base:
-	cd $(WXDIR)/src/common; $(MAKE) -f makefile.g95 GUI=$(GUI) GUISUFFIX=$(GUISUFFIX) CC=$(CC)\
- OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
 	$(RANLIB) $@
 
-#$(MSWOBJDIR):
-#	mkdir $(OBJDIR)
-
-#$(COMMOBJDIR):
-#	mkdir $(COMMDIR)/$(OBJDIR)
-
-#$(GENERICOBJDIR):
-#	mkdir $(GENDIR)/$(OBJDIR)
-
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-	$(CCLEX) -c $(CPPFLAGS) -o $@ $(COMMDIR)/y_tab.c
+	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+	copy ..\common\dosyacc.c ..\common\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+	copy ..\common\doslex.c ..\common\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
-$(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
-	$(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
-
-# The following may be required for some versions of LEX/FLEX
-#	$(LEX) -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
 #	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
 #	rm -f lex.yy.c
-
+#
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.
-$(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
-	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) $(COMMDIR)/parser.y
 #	mv y.tab.c $(COMMDIR)/y_tab.c
 
-
-# Extra targets
-rcparser:
-	cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_rcp:
-	cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
 clean:
-	rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
+	-erase *.o
+	-erase core
+	-erase ..\common\y_tab.c
+	-erase ..\common\lex_yy.c
+	-erase ..\common\*.o
+	-erase ..\generic\*.o
+	-erase ..\png\*.o
+	-erase ..\zlib\*.o
+	-erase ..\jpeg\*.o
+	-erase ..\..\lib\libwx$(GUISUFFIX).a
 
 cleanall: clean
 
+MFTYPE=g95
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw