This commit was manufactured by cvs2svn to create tag

'MAKEFILES_WITHOUT_TMAKE'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/MAKEFILES_WITHOUT_TMAKE@2998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-13 21:59:59 +00:00
10 changed files with 6289 additions and 80 deletions
--- a/build/aclocal/cppunit.m4
+++ b/build/aclocal/cppunit.m4
@@ -1,80 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN(AM_PATH_CPPUNIT,
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -0,0 +1,780 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1998
+# Updated:
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for MS Windows,
+# and Borland C++ (32-bit).
+
+!if "$(BCCDIR)" == ""
+!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
+!endif
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+# Set all these to 1 if you want to build a dynamic library
+!if "$(DLL)" == "1"
+WXMAKINGDLL=1
+WXBUILDDLL=1
+!endif
+
+!include $(WXDIR)\src\makeb32.env
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+USE_CTL3D=0
+USE_XPM_IN_MSW=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+!if "$(USE_CTL3D)" == "1"
+#Use WIN32S/WIN95 32 bit version ctl3d32.dll under win95 (Andre Beltman)
+PERIPH_LIBS=$(WXDIR)\lib\ctl3d32.lib $(PERIPH_LIBS)
+PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
+!endif
+
+!if "$(USE_XPM_IN_MSW)" == "1"
+PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
+PERIPH_TARGET=xpm $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+!endif
+
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+PERIPH_LIBS=
+PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
+
+!if "$(DLL)" == "0"
+DUMMY=dummy
+!else
+DUMMY=dummydll
+LIBS= cw32 import32 ole2w32
+!endif
+
+LIBTARGET=$(WXLIB)
+
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= \
+  $(MSWDIR)\choicdgg.obj \
+  $(MSWDIR)\gridg.obj \
+  $(MSWDIR)\laywin.obj \
+  $(MSWDIR)\panelg.obj \
+  $(MSWDIR)\progdlgg.obj \
+  $(MSWDIR)\prop.obj \
+  $(MSWDIR)\proplist.obj \
+  $(MSWDIR)\propform.obj \
+  $(MSWDIR)\sashwin.obj \
+  $(MSWDIR)\scrolwin.obj \
+  $(MSWDIR)\splitter.obj \
+  $(MSWDIR)\statusbr.obj \
+  $(MSWDIR)\tabg.obj \
+  $(MSWDIR)\textdlgg.obj \
+  $(MSWDIR)\tipdlg.obj
+
+# Not needed:
+#  $(MSWDIR)\colrdlgg.obj \
+#  $(MSWDIR)\fontdlgg.obj \
+#  $(MSWDIR)\helpxlp.obj \
+#  $(MSWDIR)\msgdlgg.obj \
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\treectrl.obj
+
+COMMONOBJS = \
+  $(MSWDIR)\config.obj \
+  $(MSWDIR)\cmndata.obj \
+  $(MSWDIR)\dcbase.obj \
+  $(MSWDIR)\dlgcmn.obj \
+  $(MSWDIR)\docview.obj \
+  $(MSWDIR)\docmdi.obj \
+  $(MSWDIR)\dynarray.obj \
+  $(MSWDIR)\event.obj \
+  $(MSWDIR)\file.obj \
+  $(MSWDIR)\fileconf.obj \
+  $(MSWDIR)\filefn.obj \
+  $(MSWDIR)\framecmn.obj \
+  $(MSWDIR)\gdicmn.obj \
+  $(MSWDIR)\helpbase.obj \
+  $(MSWDIR)\image.obj \
+  $(MSWDIR)\imagbmp.obj \
+  $(MSWDIR)\imagpng.obj \
+  $(MSWDIR)\imagjpeg.obj \
+  $(MSWDIR)\imaggif.obj \
+  $(MSWDIR)\intl.obj \
+  $(MSWDIR)\ipcbase.obj \
+  $(MSWDIR)\log.obj \
+  $(MSWDIR)\layout.obj \
+  $(MSWDIR)\memory.obj \
+  $(MSWDIR)\mimetype.obj \
+  $(MSWDIR)\module.obj \
+  $(MSWDIR)\object.obj \
+  $(MSWDIR)\prntbase.obj \
+  $(MSWDIR)\resource.obj \
+  $(MSWDIR)\tbarbase.obj \
+  $(MSWDIR)\tbarsmpl.obj \
+  $(MSWDIR)\textfile.obj \
+  $(MSWDIR)\timercmn.obj \
+  $(MSWDIR)\utilscmn.obj \
+  $(MSWDIR)\validate.obj \
+  $(MSWDIR)\valgen.obj \
+  $(MSWDIR)\valtext.obj \
+  $(MSWDIR)\variant.obj \
+  $(MSWDIR)\date.obj \
+  $(MSWDIR)\hash.obj \
+  $(MSWDIR)\list.obj \
+  $(MSWDIR)\paper.obj \
+  $(MSWDIR)\string.obj \
+  $(MSWDIR)\time.obj \
+  $(MSWDIR)\wxexpr.obj \
+  $(MSWDIR)\y_tab.obj \
+  $(MSWDIR)\stream.obj \
+  $(MSWDIR)\wfstream.obj \
+  $(MSWDIR)\mstream.obj \
+  $(MSWDIR)\zstream.obj \
+  $(MSWDIR)\datstrm.obj \
+  $(MSWDIR)\sckstrm.obj \
+  $(MSWDIR)\extended.obj \
+  $(MSWDIR)\wincmn.obj \
+  $(MSWDIR)\objstrm.obj \
+  $(MSWDIR)\dynlib.obj \
+  $(MSWDIR)\tokenzr.obj \
+  $(MSWDIR)\socket.obj \
+  $(MSWDIR)\sckint.obj \
+  $(MSWDIR)\sckaddr.obj \
+  $(MSWDIR)\protocol.obj \
+  $(MSWDIR)\url.obj \
+  $(MSWDIR)\http.obj \
+  $(MSWDIR)\ftp.obj \
+  $(MSWDIR)\sckfile.obj \
+  $(MSWDIR)\sckipc.obj \
+  $(MSWDIR)\wxchar.obj
+
+#  $(MSWDIR)\odbc.obj \
+#  $(MSWDIR)\matrix.obj \
+
+MSWOBJS = \
+  $(MSWDIR)\accel.obj \
+  $(MSWDIR)\app.obj \
+  $(MSWDIR)\bitmap.obj \
+  $(MSWDIR)\bmpbuttn.obj \
+  $(MSWDIR)\brush.obj \
+  $(MSWDIR)\button.obj \
+  $(MSWDIR)\caret.obj \
+  $(MSWDIR)\checkbox.obj \
+  $(MSWDIR)\checklst.obj \
+  $(MSWDIR)\choice.obj \
+  $(MSWDIR)\clipbrd.obj \
+  $(MSWDIR)\colordlg.obj \
+  $(MSWDIR)\colour.obj \
+  $(MSWDIR)\combobox.obj \
+  $(MSWDIR)\control.obj \
+  $(MSWDIR)\curico.obj \
+  $(MSWDIR)\cursor.obj \
+  $(MSWDIR)\data.obj \
+  $(MSWDIR)\dc.obj \
+  $(MSWDIR)\dcmemory.obj \
+  $(MSWDIR)\dcclient.obj \
+  $(MSWDIR)\dcprint.obj \
+  $(MSWDIR)\dcscreen.obj \
+  $(MSWDIR)\dde.obj \
+  $(MSWDIR)\dialog.obj \
+  $(MSWDIR)\dib.obj \
+  $(MSWDIR)\dibutils.obj \
+  $(MSWDIR)\dirdlg.obj \
+  $(MSWDIR)\filedlg.obj \
+  $(MSWDIR)\font.obj \
+  $(MSWDIR)\fontdlg.obj \
+  $(MSWDIR)\frame.obj \
+  $(MSWDIR)\gauge95.obj \
+  $(MSWDIR)\gaugemsw.obj \
+  $(MSWDIR)\gdiobj.obj \
+  $(MSWDIR)\helpwin.obj \
+  $(MSWDIR)\icon.obj \
+  $(MSWDIR)\imaglist.obj \
+  $(MSWDIR)\joystick.obj \
+  $(MSWDIR)\listbox.obj \
+  $(MSWDIR)\listctrl.obj \
+  $(MSWDIR)\main.obj \
+  $(MSWDIR)\mdi.obj \
+  $(MSWDIR)\menu.obj \
+  $(MSWDIR)\menuitem.obj \
+  $(MSWDIR)\metafile.obj \
+  $(MSWDIR)\minifram.obj \
+  $(MSWDIR)\msgdlg.obj \
+  $(MSWDIR)\nativdlg.obj \
+  $(MSWDIR)\notebook.obj \
+  $(MSWDIR)\ownerdrw.obj \
+  $(MSWDIR)\palette.obj \
+  $(MSWDIR)\pen.obj \
+  $(MSWDIR)\penwin.obj \
+  $(MSWDIR)\pnghand.obj \
+  $(MSWDIR)\printdlg.obj \
+  $(MSWDIR)\printwin.obj \
+  $(MSWDIR)\radiobox.obj \
+  $(MSWDIR)\radiobut.obj \
+  $(MSWDIR)\region.obj \
+  $(MSWDIR)\registry.obj \
+  $(MSWDIR)\regconf.obj \
+  $(MSWDIR)\scrolbar.obj \
+  $(MSWDIR)\settings.obj \
+  $(MSWDIR)\slidrmsw.obj \
+  $(MSWDIR)\slider95.obj \
+  $(MSWDIR)\spinbutt.obj \
+  $(MSWDIR)\statbmp.obj \
+  $(MSWDIR)\statbox.obj \
+  $(MSWDIR)\statline.obj \
+  $(MSWDIR)\stattext.obj \
+  $(MSWDIR)\statbr95.obj \
+  $(MSWDIR)\tabctrl.obj \
+  $(MSWDIR)\tbarmsw.obj \
+  $(MSWDIR)\textctrl.obj \
+  $(MSWDIR)\txtstrm.obj \
+  $(MSWDIR)\thread.obj \
+  $(MSWDIR)\timer.obj \
+  $(MSWDIR)\tooltip.obj \
+  $(MSWDIR)\treectrl.obj \
+  $(MSWDIR)\taskbar.obj \
+  $(MSWDIR)\tbar95.obj \
+  $(MSWDIR)\utils.obj \
+  $(MSWDIR)\utilsexc.obj \
+  $(MSWDIR)\wave.obj \
+  $(MSWDIR)\window.obj \
+  $(MSWDIR)\xpmhand.obj \
+  $(MSWDIR)\droptgt.obj \
+  $(MSWDIR)\dropsrc.obj \
+  $(MSWDIR)\oleutils.obj \
+  $(MSWDIR)\dataobj.obj \
+  $(MSWDIR)\uuid.obj
+
+# Unfortunately this causes a crash when the oleauto sample starts.
+#  $(MSWDIR)\automtn.obj
+
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+
+default:	wx
+
+wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all:	all_libs all_execs
+
+!if "$(DLL)" == "0"
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+        -erase $(LIBTARGET)
+	tlib $(LIBTARGET) /P512 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+!
+
+!else
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+	-erase $(LIBTARGET)
+	-erase $(WXLIBDIR)\wx.dll
+        tlink32 $(LINK_FLAGS) /v @&&!
+c0d32.obj $(OBJECTS)
+$(WXLIBDIR)\wx
+nul
+$(PERIPH_LIBS) $(LIBS)
+wxb32
+!
+        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+
+!endif
+
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+#        cl @<<
+#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+#<<
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+#$(OBJECTS):	$(WXDIR)\include\wx\setup.h
+
+$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+
+$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
+
+$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
+
+$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+
+$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)
+
+$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)
+
+$(MSWDIR)\caret.obj:     $(MSWDIR)\caret.$(SRCSUFF)
+
+$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)
+
+$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+
+$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)
+
+$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+
+$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+
+$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+
+$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+
+$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+
+$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+
+$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+
+$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+
+$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+
+$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+
+$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+
+$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+
+$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+
+$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+
+$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+
+$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+
+$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+
+$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+
+$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+
+$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+
+$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+
+$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+
+$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+
+$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+
+$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+
+$(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+
+$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+
+$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+
+$(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+
+$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+
+$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+
+$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+
+$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+
+$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+
+$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+
+$(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+
+$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+
+$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+
+$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+
+$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+
+$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+
+$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+
+$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+
+$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+
+$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+
+$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+
+$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+
+$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+
+$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+
+$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+
+$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+
+$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+
+$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+
+$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+
+$(MSWDIR)\statline.obj:     $(MSWDIR)\statline.$(SRCSUFF)
+
+$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+
+$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+
+$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+
+$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+
+$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+
+$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+
+$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+
+$(MSWDIR)\txtstrm.obj:     $(MSWDIR)\txtstrm.$(SRCSUFF)
+
+$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+
+$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(SRCSUFF)
+
+$(MSWDIR)\tooltip.obj:     $(MSWDIR)\tooltip.$(SRCSUFF)
+
+$(MSWDIR)\treectrl.obj:     $(MSWDIR)\treectrl.$(SRCSUFF)
+
+$(MSWDIR)\utils.obj:     $(MSWDIR)\utils.$(SRCSUFF)
+
+$(MSWDIR)\utilsexc.obj:	$(MSWDIR)\utilsexc.$(SRCSUFF)
+
+$(MSWDIR)\wave.obj:     $(MSWDIR)\wave.$(SRCSUFF)
+
+$(MSWDIR)\window.obj:     $(MSWDIR)\window.$(SRCSUFF)
+
+$(MSWDIR)\droptgt.obj:     $(OLEDIR)\droptgt.$(SRCSUFF)
+
+$(MSWDIR)\dropsrc.obj:     $(OLEDIR)\dropsrc.$(SRCSUFF)
+
+$(MSWDIR)\dataobj.obj:     $(OLEDIR)\dataobj.$(SRCSUFF)
+
+$(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
+
+$(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
+
+$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+
+########################################################
+# Common objects (always compiled)
+
+$(MSWDIR)\config.obj:     $(COMMDIR)\config.$(SRCSUFF)
+
+$(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
+
+$(MSWDIR)\dcbase.obj:     $(COMMDIR)\dcbase.$(SRCSUFF)
+
+$(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+
+$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+
+$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+
+$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+
+$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+
+$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+
+$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+
+$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+
+$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+
+$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
+$(MSWDIR)\imagbmp.obj:     $(COMMDIR)\imagbmp.$(SRCSUFF)
+
+$(MSWDIR)\imagpng.obj:     $(COMMDIR)\imagpng.$(SRCSUFF)
+
+$(MSWDIR)\imagjpeg.obj:     $(COMMDIR)\imagjpeg.$(SRCSUFF)
+
+$(MSWDIR)\imaggif.obj:     $(COMMDIR)\imaggif.$(SRCSUFF)
+
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
+$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+
+$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+
+$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+
+$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+
+$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+
+$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+
+$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+
+$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+
+$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+
+$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+
+$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+
+$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+
+$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+
+$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+
+$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+
+$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+
+$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+
+$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+
+$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+
+$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+
+$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+
+$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+
+$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+
+$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
+
+$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+
+$(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
+
+$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+
+$(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
+
+$(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
+
+$(MSWDIR)\datstrm.obj:	$(COMMDIR)\datstrm.$(SRCSUFF)
+
+$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
+
+$(MSWDIR)\mstream.obj:	$(COMMDIR)\mstream.$(SRCSUFF)
+
+$(MSWDIR)\zstream.obj:	$(COMMDIR)\zstream.$(SRCSUFF)
+
+$(MSWDIR)\wfstream.obj:	$(COMMDIR)\wfstream.$(SRCSUFF)
+
+$(MSWDIR)\stream.obj:	$(COMMDIR)\stream.$(SRCSUFF)
+
+$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
+
+$(MSWDIR)\dlgcmn.obj:	$(COMMDIR)\dlgcmn.$(SRCSUFF)
+
+$(MSWDIR)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
+
+$(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
+
+$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
+
+$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
+
+$(MSWDIR)\sckint.obj:	$(COMMDIR)\sckint.$(SRCSUFF)
+
+$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+
+$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+
+$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+
+$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+
+$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+
+$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+
+$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
+
+$(MSWDIR)\wxchar.obj:	$(COMMDIR)\wxchar.$(SRCSUFF)
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+
+$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+
+$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+
+$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+
+$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+
+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+
+$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+
+$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+
+$(MSWDIR)\progdlgg.obj:     $(GENDIR)\progdlgg.$(SRCSUFF)
+
+$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+
+$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+
+$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+
+$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+
+$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+
+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+
+$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+
+$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+
+$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
+
+$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
+
+$(MSWDIR)\tipdlg.obj:     $(GENDIR)\tipdlg.$(SRCSUFF)
+
+$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(SRCSUFF)
+
+all_utils:
+    cd $(WXDIR)\utils
+    make -f makefile.b32
+    cd $(WXDIR)\src\msw
+
+all_samples:
+    cd $(WXDIR)\samples
+    make -f makefile.b32
+    cd $(WXDIR)\src\msw
+
+all_execs:
+    cd $(WXDIR)\utils
+    make -f makefile.b32 all_execs
+    cd $(WXDIR)\src\msw
+
+wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+	cd $(WXDIR)\src\msw
+
+clean_wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 clean
+	cd $(WXDIR)\src\msw
+
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+jpeg:    $(CFG)
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw
+
+clean_jpeg:
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+$(CFG): makefile.b32
+	copy &&!
+-H=$(WXDIR)\src\msw\wx32.csm
+-3
+-d
+-R-
+-X
+-w-par
+-w-aus
+-w-hid # virtual function A hides virtual function B
+-WE
+-tWM
+
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-DWIN32
+$(OPT)
+$(DEBUG_FLAGS)
+$(WIN95FLAG)
+! $(CFG)
+
+#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
+# -Oxt
+
+clean: $(PERIPH_CLEAN_TARGET)
+    -erase $(LIBTARGET)
+    -erase *.obj
+    -erase *.pch
+    -erase *.csm
+    -erase *.cfg
+	-erase ..\common\y_tab.c
+    -erase ..\common\lex_yy.c
+
+cleanall: clean
+
+
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -0,0 +1,763 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for Windows 3.1
+# and Borland C++ 3.1
+
+!if "$(BCCDIR)" == ""
+!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
+!endif
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+!if "$(CFG)" == ""
+#!error You must start compiling from wx\src, not wx\src\msw.
+!endif
+
+!ifndef DEBUG
+DEBUG=0
+!endif
+
+WXDIR = $(WXWIN)
+
+!include $(WXDIR)\src\makebcc.env
+
+THISDIR = $(WXDIR)\src\msw
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+USE_CTL3D=1
+USE_XPM_IN_MSW=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+!if "$(USE_CTL3D)" == "1"
+PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+!endif
+
+!if "$(USE_XPM_IN_MSW)" == "1"
+PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
+PERIPH_TARGET=xpm $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+!endif
+
+# TODO: add these libraries
+# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
+PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)
+
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+LIBTARGET= $(WXLIBDIR)\wx.lib
+DUMMY=dummy
+
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= \
+  $(MSWDIR)\choicdgg.obj \
+  $(MSWDIR)\colrdlgg.obj \
+  $(MSWDIR)\fontdlgg.obj \
+  $(MSWDIR)\gridg.obj \
+  $(MSWDIR)\imaglist.obj \
+  $(MSWDIR)\helpxlp.obj \
+  $(MSWDIR)\laywin.obj \
+  $(MSWDIR)\listctrl.obj \
+  $(MSWDIR)\notebook.obj \
+  $(MSWDIR)\panelg.obj \
+  $(MSWDIR)\progdlgg.obj \
+  $(MSWDIR)\prop.obj \
+  $(MSWDIR)\propform.obj \
+  $(MSWDIR)\proplist.obj \
+  $(MSWDIR)\sashwin.obj \
+  $(MSWDIR)\scrolwin.obj \
+  $(MSWDIR)\splitter.obj \
+  $(MSWDIR)\statusbr.obj \
+  $(MSWDIR)\tabg.obj \
+  $(MSWDIR)\textdlgg.obj \
+  $(MSWDIR)\tipdlg.obj \
+  $(MSWDIR)\treectrl.obj
+
+#  $(MSWDIR)\msgdlgg.obj \
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+
+COMMONOBJS = \
+  $(MSWDIR)\config.obj \
+  $(MSWDIR)\cmndata.obj \
+  $(MSWDIR)\dcbase.obj \
+  $(MSWDIR)\docview.obj \
+  $(MSWDIR)\docmdi.obj \
+  $(MSWDIR)\dynarray.obj \
+  $(MSWDIR)\event.obj \
+  $(MSWDIR)\file.obj \
+  $(MSWDIR)\fileconf.obj \
+  $(MSWDIR)\filefn.obj \
+  $(MSWDIR)\framecmn.obj \
+  $(MSWDIR)\gdicmn.obj \
+  $(MSWDIR)\helpbase.obj \
+  $(MSWDIR)\image.obj \
+  $(MSWDIR)\intl.obj \
+  $(MSWDIR)\ipcbase.obj \
+  $(MSWDIR)\log.obj \
+  $(MSWDIR)\layout.obj \
+  $(MSWDIR)\memory.obj \
+  $(MSWDIR)\module.obj \
+  $(MSWDIR)\object.obj \
+  $(MSWDIR)\prntbase.obj \
+  $(MSWDIR)\resource.obj \
+  $(MSWDIR)\resourc2.obj \
+  $(MSWDIR)\tbarbase.obj \
+  $(MSWDIR)\tbarsmpl.obj \
+  $(MSWDIR)\textfile.obj \
+  $(MSWDIR)\timercmn.obj \
+  $(MSWDIR)\utilscmn.obj \
+  $(MSWDIR)\validate.obj \
+  $(MSWDIR)\valgen.obj \
+  $(MSWDIR)\valtext.obj \
+  $(MSWDIR)\variant.obj \
+  $(MSWDIR)\date.obj \
+  $(MSWDIR)\hash.obj \
+  $(MSWDIR)\list.obj \
+  $(MSWDIR)\paper.obj \
+  $(MSWDIR)\string.obj \
+  $(MSWDIR)\time.obj \
+  $(MSWDIR)\wxexpr.obj \
+  $(MSWDIR)\y_tab.obj \
+  $(MSWDIR)\stream.obj \
+  $(MSWDIR)\wfstream.obj \
+  $(MSWDIR)\mstream.obj \
+  $(MSWDIR)\zstream.obj \
+  $(MSWDIR)\datstrm.obj \
+  $(MSWDIR)\sckstrm.obj \
+  $(MSWDIR)\extended.obj \
+  $(MSWDIR)\dlgcmn.obj \
+  $(MSWDIR)\wincmn.obj \
+  $(MSWDIR)\objstrm.obj \
+  $(MSWDIR)\dynlib.obj \
+  $(MSWDIR)\tokenzr.obj \
+  $(MSWDIR)\wxchar.obj
+
+# Don't compile for WIN16
+#  $(MSWDIR)\socket.obj \
+#  $(MSWDIR)\sckaddr.obj \
+#  $(MSWDIR)\protocol.obj \
+#  $(MSWDIR)\url.obj \
+#  $(MSWDIR)\http.obj \
+#  $(MSWDIR)\ftp.obj \
+#  $(MSWDIR)\sckfile.obj \
+#  $(MSWDIR)\sckipc.obj \
+
+# Needs extra files (sql*.h) so not compiled by default.
+#  $(MSWDIR)\odbc.obj \
+
+# Uses WIN32 registry functions
+#  $(MSWDIR)\mimetype.obj \
+
+MSWOBJS = \
+  $(MSWDIR)\accel.obj \
+  $(MSWDIR)\app.obj \
+  $(MSWDIR)\bitmap.obj \
+  $(MSWDIR)\bmpbuttn.obj \
+  $(MSWDIR)\brush.obj \
+  $(MSWDIR)\button.obj \
+  $(MSWDIR)\checkbox.obj \
+  $(MSWDIR)\checklst.obj \
+  $(MSWDIR)\caret.obj \
+  $(MSWDIR)\choice.obj \
+  $(MSWDIR)\clipbrd.obj \
+  $(MSWDIR)\colordlg.obj \
+  $(MSWDIR)\colour.obj \
+  $(MSWDIR)\combobox.obj \
+  $(MSWDIR)\control.obj \
+  $(MSWDIR)\curico.obj \
+  $(MSWDIR)\cursor.obj \
+  $(MSWDIR)\data.obj \
+  $(MSWDIR)\dc.obj \
+  $(MSWDIR)\dcmemory.obj \
+  $(MSWDIR)\dcclient.obj \
+  $(MSWDIR)\dcprint.obj \
+  $(MSWDIR)\dcscreen.obj \
+  $(MSWDIR)\dde.obj \
+  $(MSWDIR)\dialog.obj \
+  $(MSWDIR)\dib.obj \
+  $(MSWDIR)\dibutils.obj \
+  $(MSWDIR)\dirdlg.obj \
+  $(MSWDIR)\filedlg.obj \
+  $(MSWDIR)\font.obj \
+  $(MSWDIR)\fontdlg.obj \
+  $(MSWDIR)\frame.obj \
+  $(MSWDIR)\gaugemsw.obj \
+  $(MSWDIR)\gdiobj.obj \
+  $(MSWDIR)\helpwin.obj \
+  $(MSWDIR)\icon.obj \
+  $(MSWDIR)\iniconf.obj \
+  $(MSWDIR)\joystick.obj \
+  $(MSWDIR)\listbox.obj \
+  $(MSWDIR)\main.obj \
+  $(MSWDIR)\mdi.obj \
+  $(MSWDIR)\menu.obj \
+  $(MSWDIR)\menuitem.obj \
+  $(MSWDIR)\metafile.obj \
+  $(MSWDIR)\minifram.obj \
+  $(MSWDIR)\msgdlg.obj \
+  $(MSWDIR)\nativdlg.obj \
+  $(MSWDIR)\ownerdrw.obj \
+  $(MSWDIR)\palette.obj \
+  $(MSWDIR)\pen.obj \
+  $(MSWDIR)\penwin.obj \
+  $(MSWDIR)\pnghand.obj \
+  $(MSWDIR)\printdlg.obj \
+  $(MSWDIR)\printwin.obj \
+  $(MSWDIR)\radiobox.obj \
+  $(MSWDIR)\radiobut.obj \
+  $(MSWDIR)\region.obj \
+  $(MSWDIR)\scrolbar.obj \
+  $(MSWDIR)\settings.obj \
+  $(MSWDIR)\slidrmsw.obj \
+  $(MSWDIR)\spinbutt.obj \
+  $(MSWDIR)\statbmp.obj \
+  $(MSWDIR)\statbox.obj \
+  $(MSWDIR)\statline.obj \
+  $(MSWDIR)\stattext.obj \
+  $(MSWDIR)\tbarmsw.obj \
+  $(MSWDIR)\textctrl.obj \
+  $(MSWDIR)\timer.obj \
+  $(MSWDIR)\utils.obj \
+  $(MSWDIR)\utilsexc.obj \
+  $(MSWDIR)\wave.obj \
+  $(MSWDIR)\window.obj \
+  $(MSWDIR)\xpmhand.obj
+
+# Unfortunately this causes a crash when the oleauto sample starts.
+#  $(MSWDIR)\automtn.obj
+
+# Not used for 16-bit compilation
+#  $(MSWDIR)\tooltip.obj \
+#  $(MSWDIR)\gauge95.obj \
+#  $(MSWDIR)\treectrl.obj \
+#  $(MSWDIR)\oleutils.obj \
+#  $(MSWDIR)\dataobj.obj \
+#  $(MSWDIR)\uuid.obj
+#  $(MSWDIR)\droptgt.obj \
+#  $(MSWDIR)\dropsrc.obj \
+#  $(MSWDIR)\imaglist.obj \
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\tabctrl.obj \
+#  $(MSWDIR)\taskbar.obj \
+#  $(MSWDIR)\tbar95.obj \
+#  $(MSWDIR)\thread.obj \
+#  $(MSWDIR)\slider95.obj \
+#  $(MSWDIR)\statbr95.obj \
+#  $(MSWDIR)\registry.obj \
+#  $(MSWDIR)\regconf.obj \
+
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+
+default:	wx
+
+wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
+	erase $(LIBTARGET)
+	tlib $(LIBTARGET) /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+!
+
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+#        cl @<<
+#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+#<<
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+#$(OBJECTS):	$(WXDIR)\include\wx\setup.h
+
+$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+
+$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
+
+$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
+
+$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+
+$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)
+
+$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)
+
+$(MSWDIR)\caret.obj:     $(MSWDIR)\caret.$(SRCSUFF)
+
+$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)
+
+$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)
+
+$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+
+$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+
+$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+
+$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+
+$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+
+$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+
+$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+
+$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+
+$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+
+$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+
+$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+
+$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+
+$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+
+$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+
+$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+
+$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+
+$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+
+$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+
+$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+
+$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+
+$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+
+$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+
+$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+
+$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+
+$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+
+$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+
+# $(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+
+$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+
+$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+
+# $(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+
+$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+
+$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+
+$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+
+$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+
+$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+
+$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+
+# $(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+
+$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+
+$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+
+$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+
+$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+
+$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+
+$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+
+$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+
+$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+
+$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+
+$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+
+$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+
+$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+
+$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+
+$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+
+$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+
+$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+
+$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+
+$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+
+$(MSWDIR)\statline.obj:     $(MSWDIR)\statline.$(SRCSUFF)
+
+$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+
+$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+
+$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+
+$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+
+$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+
+$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+
+$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+
+$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+
+$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(SRCSUFF)
+
+$(MSWDIR)\tooltip.obj:     $(MSWDIR)\tooltip.$(SRCSUFF)
+
+# $(MSWDIR)\treectrl.obj:     $(MSWDIR)\treectrl.$(SRCSUFF)
+
+$(MSWDIR)\utils.obj:     $(MSWDIR)\utils.$(SRCSUFF)
+
+$(MSWDIR)\utilsexc.obj:	$(MSWDIR)\utilsexc.$(SRCSUFF)
+
+$(MSWDIR)\wave.obj:     $(MSWDIR)\wave.$(SRCSUFF)
+
+$(MSWDIR)\window.obj:     $(MSWDIR)\window.$(SRCSUFF)
+
+$(MSWDIR)\droptgt.obj:     $(OLEDIR)\droptgt.$(SRCSUFF)
+
+$(MSWDIR)\dropsrc.obj:     $(OLEDIR)\dropsrc.$(SRCSUFF)
+
+$(MSWDIR)\dataobj.obj:     $(OLEDIR)\dataobj.$(SRCSUFF)
+
+$(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
+
+$(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
+
+$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+
+########################################################
+# Common objects (always compiled)
+
+$(MSWDIR)\config.obj:     $(COMMDIR)\config.$(SRCSUFF)
+
+$(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
+
+$(MSWDIR)\dcbase.obj:     $(COMMDIR)\dcbase.$(SRCSUFF)
+
+$(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+
+$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+
+$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+
+$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+
+$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+
+$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+
+$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+
+$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+
+$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+
+$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
+$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+
+$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+
+$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+
+$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+
+$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+
+$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+
+$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+
+$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+
+$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+
+$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+
+$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+
+$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+
+$(MSWDIR)\resourc2.obj:     $(COMMDIR)\resourc2.$(SRCSUFF)
+
+$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+
+$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+
+$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+
+$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+
+$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+
+$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+
+$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+
+$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+
+$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+
+$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+
+$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+
+$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
+
+$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+
+$(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
+
+$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+
+$(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
+
+$(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
+
+$(MSWDIR)\datstrm.obj:	$(COMMDIR)\datstrm.$(SRCSUFF)
+
+$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
+
+$(MSWDIR)\mstream.obj:	$(COMMDIR)\mstream.$(SRCSUFF)
+
+$(MSWDIR)\zstream.obj:	$(COMMDIR)\zstream.$(SRCSUFF)
+
+$(MSWDIR)\wfstream.obj:	$(COMMDIR)\wfstream.$(SRCSUFF)
+
+$(MSWDIR)\stream.obj:	$(COMMDIR)\stream.$(SRCSUFF)
+
+$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
+
+$(MSWDIR)\dlgcmn.obj:	$(COMMDIR)\dlgcmn.$(SRCSUFF)
+
+$(MSWDIR)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
+
+$(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
+
+$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
+
+$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
+
+$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+
+$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+
+$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+
+$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+
+$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+
+$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+
+$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
+
+$(MSWDIR)\wxchar.obj:	$(COMMDIR)\wxchar.$(SRCSUFF)
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+
+$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+
+$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+
+$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+
+$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+
+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+
+$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+
+$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+
+$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+
+$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+
+$(MSWDIR)\progdlgg.obj:     $(GENDIR)\progdlgg.$(SRCSUFF)
+
+$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+
+$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+
+$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+
+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+
+$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+
+$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+
+$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
+
+$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
+
+$(MSWDIR)\tipdlg.obj:     $(GENDIR)\tipdlg.$(SRCSUFF)
+
+$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(SRCSUFF)
+
+$(MSWDIR)\treectrl.obj:     $(GENDIR)\treectrl.$(SRCSUFF)
+
+$(MSWDIR)\listctrl.obj:     $(GENDIR)\listctrl.$(SRCSUFF)
+
+$(MSWDIR)\imaglist.obj:     $(GENDIR)\imaglist.$(SRCSUFF)
+
+$(MSWDIR)\notebook.obj:     $(GENDIR)\notebook.$(SRCSUFF)
+
+all_utils:
+    cd $(WXDIR)\utils
+    make -f makefile.bcc
+    cd $(WXDIR)\src\msw
+
+all_samples:
+    cd $(WXDIR)\samples
+    make -f makefile.bcc
+    cd $(WXDIR)\src\msw
+
+all_execs:
+    cd $(WXDIR)\utils
+    make -f makefile.bcc all_execs
+    cd $(WXDIR)\src\msw
+
+all_libs:
+    cd $(WXDIR)\src\msw
+    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+          wxstring wxtree mfutils # wxxpm
+
+all_contribs:
+    cd $(WXDIR)\src\msw
+    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
+
+# CONTRIB
+ctl3d:  $(CFG)
+        cd $(WXDIR)\src\msw\ctl3d\borland
+        make -f makefile.bcc -DCFG=$(CFG)
+        cd $(WXDIR)\src\msw
+
+wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+	cd $(WXDIR)\src\msw
+
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.bcc 
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.bcc clean
+        cd $(WXDIR)\src\msw
+
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.bcc
+        cd $(WXDIR)\src\msw
+
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.bcc clean
+        cd $(WXDIR)\src\msw
+
+$(CFG): makefile.bcc
+	copy &&!
+-H=$(WXDIR)\src\msw\borland.pch
+-2
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch
+-ml
+-Od
+-WE
+-Fs-
+-Vf
+-Ff=4
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-D__WIN16__
+! $(CFG)
+!if "$(BOR_VER)" == "3.1"
+	echo -Ff=4 >>$(CFG)
+!elif "$(BOR_VER)" == "4"
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!else
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!endif
+
+# -O was: -Oxt
+
+clean: $(PERIPH_CLEAN_TARGET)
+    erase $(LIBTARGET)
+    erase *.obj
+    erase *.pch
+    erase *.csm
+    erase *.cfg
+	erase ..\common\y_tab.c
+    erase ..\common\lex_yy.c
+
+cleanall: clean
+
+
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -0,0 +1,321 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "@(#)makefile.unx	1.2 5/9/94"
+#
+# Makefile for libwx.a
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# All common UNIX 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
+#   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
+XPMDIR=../xpm
+OLEDIR=ole
+MSWDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= \
+  $(GENDIR)/choicdgg.$(OBJSUFF) \
+  $(GENDIR)/dirdlgg.$(OBJSUFF) \
+  $(GENDIR)/gridg.$(OBJSUFF) \
+  $(GENDIR)/laywin.$(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)
+
+#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
+#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+
+COMMONOBJS = \
+  $(COMMDIR)/config.$(OBJSUFF) \
+  $(COMMDIR)/cmndata.$(OBJSUFF) \
+  $(COMMDIR)/dcbase.$(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)/image.$(OBJSUFF) \
+  $(COMMDIR)/imagebmp.$(OBJSUFF) \
+  $(COMMDIR)/imagpng.$(OBJSUFF) \
+  $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+  $(COMMDIR)/intl.$(OBJSUFF) \
+  $(COMMDIR)/ipcbase.$(OBJSUFF) \
+  $(COMMDIR)/layout.$(OBJSUFF) \
+  $(COMMDIR)/log.$(OBJSUFF) \
+  $(COMMDIR)/memory.$(OBJSUFF) \
+  $(COMMDIR)/module.$(OBJSUFF) \
+  $(COMMDIR)/mimetype.$(OBJSUFF) \
+  $(COMMDIR)/object.$(OBJSUFF) \
+  $(COMMDIR)/odbc.$(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)/valgen.$(OBJSUFF) \
+  $(COMMDIR)/valtext.$(OBJSUFF) \
+  $(COMMDIR)/date.$(OBJSUFF) \
+  $(COMMDIR)/wxexpr.$(OBJSUFF) \
+  $(COMMDIR)/hash.$(OBJSUFF) \
+  $(COMMDIR)/list.$(OBJSUFF) \
+  $(COMMDIR)/variant.$(OBJSUFF) \
+  $(COMMDIR)/paper.$(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)/dlgcmn.$(OBJSUFF) \
+  $(COMMDIR)/wincmn.$(OBJSUFF) \
+  $(COMMDIR)/wxchar.$(OBJSUFF)
+
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.
+#  $(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) \
+
+MSWOBJS = \
+  accel.$(OBJSUFF) \
+  app.$(OBJSUFF) \
+  bitmap.$(OBJSUFF) \
+  bmpbuttn.$(OBJSUFF) \
+  brush.$(OBJSUFF) \
+  button.$(OBJSUFF) \
+  checkbox.$(OBJSUFF) \
+  checklst.$(OBJSUFF) \
+  caret.$(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) \
+  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) \
+  statline.$(OBJSUFF) \
+  statbr95.$(OBJSUFF) \
+  stattext.$(OBJSUFF) \
+  tabctrl.$(OBJSUFF) \
+  taskbar.$(OBJSUFF) \
+  tbar95.$(OBJSUFF) \
+  tbarmsw.$(OBJSUFF) \
+  textctrl.$(OBJSUFF) \
+  thread.$(OBJSUFF) \
+  timer.$(OBJSUFF) \
+  tooltip.$(OBJSUFF) \
+  treectrl.$(OBJSUFF) \
+  utils.$(OBJSUFF) \
+  utilsexc.$(OBJSUFF) \
+  wave.$(OBJSUFF) \
+  window.$(OBJSUFF) \
+  xpmhand.$(OBJSUFF)
+
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+#  dirdlg.$(OBJSUFF) \
+
+# OLE not supported yet by GnuWin32
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF) \
+#  $(OLEDIR)/automtn.$(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) # $(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) $@
+
+$(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
+
+# 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) -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
+
+# 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
+
+cleanall: clean
+
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -0,0 +1,262 @@
+# Symantec C++ makefile for the msw objects
+# called from src\makefile.sc
+
+# configuration section (see src\makefile.sc) ###########################
+
+WXDIR = $(WXWIN)
+
+include ..\makesc.env
+
+DEBUG=0
+
+LIBTARGET = $(LIBDIR)\wx.lib
+
+OPTIONS=
+
+# end of configuration section ##########################################
+
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+
+GENERICOBJS= \
+  $(GENDIR)\choicdgg.obj \
+  $(GENDIR)\gridg.obj \
+  $(GENDIR)\laywin.obj \
+  $(GENDIR)\panelg.obj \
+  $(GENDIR)\progdlgg.obj \
+  $(GENDIR)\prop.obj \
+  $(GENDIR)\propform.obj \
+  $(GENDIR)\proplist.obj \
+  $(GENDIR)\sashwin.obj \
+  $(GENDIR)\scrolwin.obj \
+  $(GENDIR)\splitter.obj \
+  $(GENDIR)\statusbr.obj \
+  $(GENDIR)\tabg.obj \
+  $(GENDIR)\textdlgg.obj \
+  $(GENDIR)\tipdlg.obj
+
+#  $(GENDIR)\imaglist.obj \
+#  $(GENDIR)\treectrl.obj \
+#  $(GENDIR)\listctrl.obj \
+#  $(GENDIR)\notebook.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= \
+  $(GENDIR)\printps.obj \
+  $(GENDIR)\prntdlgg.obj \
+  $(GENDIR)\msgdlgg.obj \
+  $(GENDIR)\helpxlp.obj \
+  $(GENDIR)\colrdlgg.obj \
+  $(GENDIR)\fontdlgg.obj
+
+COMMONOBJS = \
+  $(COMMDIR)\cmndata.obj \
+  $(COMMDIR)\config.obj \
+  $(COMMDIR)\dcbase.obj \
+  $(COMMDIR)\docview.obj \
+  $(COMMDIR)\docmdi.obj \
+  $(COMMDIR)\dynarray.obj \
+  $(COMMDIR)\dynlib.obj \
+  $(COMMDIR)\event.obj \
+  $(COMMDIR)\file.obj \
+  $(COMMDIR)\filefn.obj \
+  $(COMMDIR)\fileconf.obj \
+  $(COMMDIR)\framecmn.obj \
+  $(COMMDIR)\gdicmn.obj \
+  $(COMMDIR)\image.obj \
+  $(COMMDIR)\intl.obj \
+  $(COMMDIR)\ipcbase.obj \
+  $(COMMDIR)\helpbase.obj \
+  $(COMMDIR)\layout.obj \
+  $(COMMDIR)\log.obj \
+  $(COMMDIR)\memory.obj \
+  $(COMMDIR)\mimetype.obj \
+  $(COMMDIR)\module.obj \
+  $(COMMDIR)\object.obj \
+  $(COMMDIR)\prntbase.obj \
+  $(COMMDIR)\resource.obj \
+  $(COMMDIR)\resourc2.obj \
+  $(COMMDIR)\tbarbase.obj \
+  $(COMMDIR)\tbarsmpl.obj \
+  $(COMMDIR)\textfile.obj \
+  $(COMMDIR)\timercmn.obj \
+  $(COMMDIR)\utilscmn.obj \
+  $(COMMDIR)\validate.obj \
+  $(COMMDIR)\valgen.obj \
+  $(COMMDIR)\valtext.obj \
+  $(COMMDIR)\date.obj \
+  $(COMMDIR)\hash.obj \
+  $(COMMDIR)\list.obj \
+  $(COMMDIR)\paper.obj \
+  $(COMMDIR)\string.obj \
+  $(COMMDIR)\time.obj \
+  $(COMMDIR)\tokenzr.obj \
+  $(COMMDIR)\wxexpr.obj \
+  $(COMMDIR)\y_tab.obj \
+  $(COMMDIR)\extended.obj \
+  $(COMMDIR)\process.obj \
+  $(COMMDIR)\wfstream.obj \
+  $(COMMDIR)\mstream.obj \
+  $(COMMDIR)\zstream.obj \
+  $(COMMDIR)\stream.obj \
+  $(COMMDIR)\datstrm.obj \
+  $(COMMDIR)\objstrm.obj \
+  $(COMMDIR)\variant.obj \
+  $(COMMDIR)\dlgcmn.obj \
+  $(COMMDIR)\wincmn.obj \
+  $(COMMDIR)\wxchar.obj
+
+# Don't compile for WIN16
+#  $(COMMDIR)\socket.obj \
+#  $(COMMDIR)\sckaddr.obj \
+#  $(COMMDIR)\sckfile.obj \
+#  $(COMMDIR)\sckipc.obj \
+#  $(COMMDIR)\sckstrm.obj \
+#  $(COMMDIR)\url.obj \
+#  $(COMMDIR)\http.obj \
+#  $(COMMDIR)\protocol.obj \
+
+# Don't compile
+#  $(COMMDIR)\db.obj \
+#  $(COMMDIR)\dbtable.obj \
+#  $(COMMDIR)\odbc.obj \
+
+MSWOBJS = \
+  $(MSWDIR)\accel.obj \
+  $(MSWDIR)\app.obj \
+  $(MSWDIR)\bitmap.obj \
+  $(MSWDIR)\bmpbuttn.obj \
+  $(MSWDIR)\brush.obj \
+  $(MSWDIR)\button.obj \
+  $(MSWDIR)\checkbox.obj \
+  $(MSWDIR)\checklst.obj \
+  $(MSWDIR)\caret.obj \
+  $(MSWDIR)\choice.obj \
+  $(MSWDIR)\clipbrd.obj \
+  $(MSWDIR)\colordlg.obj \
+  $(MSWDIR)\colour.obj \
+  $(MSWDIR)\combobox.obj \
+  $(MSWDIR)\control.obj \
+  $(MSWDIR)\curico.obj \
+  $(MSWDIR)\cursor.obj \
+  $(MSWDIR)\data.obj \
+  $(MSWDIR)\dc.obj \
+  $(MSWDIR)\dcmemory.obj \
+  $(MSWDIR)\dcclient.obj \
+  $(MSWDIR)\dcprint.obj \
+  $(MSWDIR)\dcscreen.obj \
+  $(MSWDIR)\dde.obj \
+  $(MSWDIR)\dialog.obj \
+  $(MSWDIR)\dib.obj \
+  $(MSWDIR)\dibutils.obj \
+  $(MSWDIR)\dirdlg.obj \
+  $(MSWDIR)\filedlg.obj \
+  $(MSWDIR)\font.obj \
+  $(MSWDIR)\fontdlg.obj \
+  $(MSWDIR)\frame.obj \
+  $(MSWDIR)\gauge95.obj \
+  $(MSWDIR)\gaugemsw.obj \
+  $(MSWDIR)\gdiobj.obj \
+  $(MSWDIR)\helpwin.obj \
+  $(MSWDIR)\icon.obj \
+  $(MSWDIR)\iniconf.obj \
+  $(MSWDIR)\listbox.obj \
+  $(MSWDIR)\main.obj \
+  $(MSWDIR)\mdi.obj \
+  $(MSWDIR)\menu.obj \
+  $(MSWDIR)\menuitem.obj \
+  $(MSWDIR)\metafile.obj \
+  $(MSWDIR)\minifram.obj \
+  $(MSWDIR)\msgdlg.obj \
+  $(MSWDIR)\nativdlg.obj \
+  $(MSWDIR)\ownerdrw.obj \
+  $(MSWDIR)\palette.obj \
+  $(MSWDIR)\pen.obj \
+  $(MSWDIR)\penwin.obj \
+  $(MSWDIR)\printdlg.obj \
+  $(MSWDIR)\printwin.obj \
+  $(MSWDIR)\radiobox.obj \
+  $(MSWDIR)\radiobut.obj \
+  $(MSWDIR)\region.obj \
+  $(MSWDIR)\registry.obj \
+  $(MSWDIR)\regconf.obj \
+  $(MSWDIR)\scrolbar.obj \
+  $(MSWDIR)\settings.obj \
+  $(MSWDIR)\slidrmsw.obj \
+  $(MSWDIR)\slider95.obj \
+  $(MSWDIR)\spinbutt.obj \
+  $(MSWDIR)\statbmp.obj \
+  $(MSWDIR)\statbox.obj \
+  $(MSWDIR)\statline.obj \
+  $(MSWDIR)\statbr95.obj \
+  $(MSWDIR)\stattext.obj \
+  $(MSWDIR)\tabctrl.obj \
+  $(MSWDIR)\taskbar.obj \
+  $(MSWDIR)\tbar95.obj \
+  $(MSWDIR)\tbarmsw.obj \
+  $(MSWDIR)\textctrl.obj \
+  $(MSWDIR)\thread.obj \
+  $(MSWDIR)\timer.obj \
+  $(MSWDIR)\tooltip.obj \
+  $(MSWDIR)\utils.obj \
+  $(MSWDIR)\utilsexc.obj \
+  $(MSWDIR)\wave.obj \
+  $(MSWDIR)\window.obj \
+  $(MSWDIR)\xpmhand.obj
+
+# Need Win95 support for these
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\imaglist.obj \
+#  $(MSWDIR)\treectrl.obj \
+#  $(OLEDIR)\droptgt.obj \
+#  $(OLEDIR)\dropsrc.obj \
+#  $(OLEDIR)\dataobj.obj \
+#  $(OLEDIR)\oleutils.obj \
+#  $(OLEDIR)\uuid.obj \
+#  $(OLEDIR)\automtn.obj
+
+# Doesn't compile with SC++ 6
+#  $(MSWDIR)\joystick.obj \
+#  $(MSWDIR)\pnghand.obj \
+
+XPMOBJECTS = 	$(XPMDIR)\crbuffri.obj\
+		$(XPMDIR)\crdatfri.obj\
+		$(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
+		$(XPMDIR)\crifrdat.obj\
+		$(XPMDIR)\data.obj\
+		$(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
+		$(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
+		$(XPMDIR)\rdftoi.obj\
+		$(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
+		$(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
+		$(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+
+all: $(LIBTARGET)
+
+$(LIBTARGET): $(OBJECTS)
+	-del $(LIBTARGET)
+	*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
+
+clean:
+	-del *.obj
+    -del $(LIBTARGET)
+
+$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+#$(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
+#	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+
--- a/src/msw/makefile.sl
+++ b/src/msw/makefile.sl
@@ -0,0 +1,929 @@
+#
+# File:		makefile.wat
+# Author:	Julian Smart
+# Created:	1998
+#
+# Makefile : Builds wxWindows library for Salford C++, WIN32
+
+include ..\makesl.env
+
+LIBTARGET   = $(WXLIB)\wx.lib
+EXTRATARGETS = # xpm png zlib
+EXTRATARGETSCLEAN = # clean_xpm clean_png clean_zlib
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+
+GENERICOBJS= choicdgg.obj \
+  dirdlgg.obj \
+  gridg.obj \
+  laywin.obj \
+  panelg.obj \
+  prop.obj \
+  progdlgg.obj \
+  propform.obj \
+  proplist.obj \
+  sashwin.obj \
+  scrolwin.obj \
+  splitter.obj \
+  statusbr.obj \
+  tabg.obj \
+  textdlgg.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
+
+COMMONOBJS = cmndata.obj \
+  config.obj \
+  dcbase.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 \
+  valgen.obj \
+  valtext.obj \
+  date.obj \
+  hash.obj \
+  list.obj \
+  paper.obj \
+  string.obj \
+  socket.obj \
+  sckint.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 \
+  wxchar.obj
+
+# Can't compile these yet under Salford C++
+#  mimetype.obj \
+#  odbc.obj \
+#  db.obj \
+#  dbtable.obj \
+
+MSWOBJS = \
+  accel.obj \
+  app.obj \
+  bitmap.obj \
+  bmpbuttn.obj \
+  brush.obj \
+  button.obj \
+  checkbox.obj \
+  checklst.obj \
+  caret.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 \
+  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 \
+  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 \
+  tooltip.obj \
+  treectrl.obj \
+  utils.obj \
+  utilsexc.obj \
+  wave.obj \
+  window.obj
+
+# No OLE functions for wxDirDialog: use generic one instead
+#  dirdlg.obj \
+#  pnghand.obj \
+#  xpmhand.obj \
+
+OLEOBJS = \
+  droptgt.obj \
+  dropsrc.obj \
+  dataobj.obj \
+  oleutils.obj \
+  uuid.obj \
+  automtn.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(OLEOBJS)
+
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+
+$(LIBTARGET) : $(OBJECTS)
+    slink $$salford.lnk
+
+clean:   $(EXTRATARGETSCLEAN)
+    -erase *.obj
+    -erase $(LIBTARGET)
+    -erase *.pch
+    -erase *.err
+
+cleanall:   clean
+
+test:   test.obj
+
+test.obj:     test.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) test.cpp
+
+accel.obj:     $(MSWDIR)\accel.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\accel.cpp /BINARY accel.obj
+
+app.obj:     $(MSWDIR)\app.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\app.cpp /BINARY app.obj
+
+bitmap.obj:     $(MSWDIR)\bitmap.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\bitmap.cpp /BINARY bitmap.obj
+
+bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\bmpbuttn.cpp /BINARY bmpbuttn.obj
+
+brush.obj:     $(MSWDIR)\brush.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\brush.cpp /BINARY brush.obj
+
+button.obj:     $(MSWDIR)\button.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\button.cpp /BINARY button.obj
+
+caret.obj:     $(MSWDIR)\caret.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\caret.cpp /BINARY caret.obj
+
+choice.obj:     $(MSWDIR)\choice.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\choice.cpp /BINARY choice.obj
+
+checkbox.obj:     $(MSWDIR)\checkbox.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\checkbox.cpp /BINARY checkbox.obj
+
+checklst.obj:     $(MSWDIR)\checklst.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\checklst.cpp /BINARY checklst.obj
+
+clipbrd.obj:     $(MSWDIR)\clipbrd.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\clipbrd.cpp /BINARY clipbrd.obj
+
+colordlg.obj:     $(MSWDIR)\colordlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\colordlg.cpp /BINARY colordlg.obj
+
+colour.obj:     $(MSWDIR)\colour.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\colour.cpp /BINARY colour.obj
+
+combobox.obj:     $(MSWDIR)\combobox.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\combobox.cpp /BINARY combobox.obj
+
+control.obj:     $(MSWDIR)\control.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\control.cpp /BINARY control.obj
+
+curico.obj:     $(MSWDIR)\curico.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\curico.cpp /BINARY curico.obj
+
+cursor.obj:     $(MSWDIR)\cursor.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\cursor.cpp /BINARY cursor.obj
+
+data.obj:     $(MSWDIR)\data.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\data.cpp /BINARY data.obj
+
+dde.obj:     $(MSWDIR)\dde.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dde.cpp /BINARY dde.obj
+
+dc.obj:     $(MSWDIR)\dc.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dc.cpp /BINARY dc.obj
+
+dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcmemory.cpp /BINARY dcmemory.obj
+
+dcclient.obj:     $(MSWDIR)\dcclient.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcclient.cpp /BINARY dcclient.obj
+
+dcprint.obj:     $(MSWDIR)\dcprint.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcprint.cpp /BINARY dcprint.obj
+
+dcscreen.obj:     $(MSWDIR)\dcscreen.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dcscreen.cpp /BINARY dcscreen.obj
+
+dialog.obj:     $(MSWDIR)\dialog.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dialog.cpp /BINARY dialog.obj
+
+dib.obj:     $(MSWDIR)\dib.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dib.cpp /BINARY dib.obj
+
+dibutils.obj:     $(MSWDIR)\dibutils.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dibutils.cpp /BINARY dibutils.obj
+
+dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\dirdlg.cpp /BINARY dirdlg.obj
+
+filedlg.obj:     $(MSWDIR)\filedlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\filedlg.cpp /BINARY filedlg.obj
+
+font.obj:     $(MSWDIR)\font.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\font.cpp /BINARY font.obj
+
+fontdlg.obj:     $(MSWDIR)\fontdlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\fontdlg.cpp /BINARY fontdlg.obj
+
+frame.obj:     $(MSWDIR)\frame.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\frame.cpp /BINARY frame.obj
+
+gauge95.obj:     $(MSWDIR)\gauge95.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gauge95.cpp /BINARY gauge95.obj
+
+gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gaugemsw.cpp /BINARY gaugemsw.obj
+
+gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gdiobj.cpp /BINARY gdiobj.obj
+
+helpwin.obj:     $(MSWDIR)\helpwin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\helpwin.cpp /BINARY helpwin.obj
+
+icon.obj:     $(MSWDIR)\icon.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\icon.cpp /BINARY icon.obj
+
+imaglist.obj:     $(MSWDIR)\imaglist.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\imaglist.cpp /BINARY imaglist.obj
+
+iniconf.obj:     $(MSWDIR)\iniconf.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\iniconf.cpp /BINARY iniconf.obj
+
+joystick.obj:     $(MSWDIR)\joystick.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\joystick.cpp /BINARY joystick.obj
+
+listbox.obj:     $(MSWDIR)\listbox.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\listbox.cpp /BINARY listbox.obj
+
+listctrl.obj:     $(MSWDIR)\listctrl.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\listctrl.cpp /BINARY listctrl.obj
+
+main.obj:     $(MSWDIR)\main.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\main.cpp /BINARY main.obj
+
+mdi.obj:     $(MSWDIR)\mdi.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\mdi.cpp /BINARY mdi.obj
+
+menu.obj:     $(MSWDIR)\menu.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\menu.cpp /BINARY menu.obj
+
+menuitem.obj:     $(MSWDIR)\menuitem.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\menuitem.cpp /BINARY menuitem.obj
+
+metafile.obj:     $(MSWDIR)\metafile.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\metafile.cpp /BINARY metafile.obj
+
+minifram.obj:     $(MSWDIR)\minifram.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\minifram.cpp /BINARY minifram.obj
+
+msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\msgdlg.cpp /BINARY msgdlg.obj
+
+nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\nativdlg.cpp /BINARY nativdlg.obj
+
+notebook.obj:     $(MSWDIR)\notebook.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\notebook.cpp /BINARY notebook.obj
+
+ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\ownerdrw.cpp /BINARY ownerdrw.obj
+
+palette.obj:     $(MSWDIR)\palette.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\palette.cpp /BINARY palette.obj
+
+pen.obj:     $(MSWDIR)\pen.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\pen.cpp /BINARY pen.obj
+
+penwin.obj:     $(MSWDIR)\penwin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\penwin.cpp /BINARY penwin.obj
+
+pnghand.obj:     $(MSWDIR)\pnghand.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\pnghand.cpp /BINARY pnghand.obj
+
+printdlg.obj:     $(MSWDIR)\printdlg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\printdlg.cpp /BINARY printdlg.obj
+
+printwin.obj:     $(MSWDIR)\printwin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\printwin.cpp /BINARY printwin.obj
+
+radiobox.obj:     $(MSWDIR)\radiobox.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\radiobox.cpp /BINARY radiobox.obj
+
+radiobut.obj:     $(MSWDIR)\radiobut.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\radiobut.cpp /BINARY radiobut.obj
+
+region.obj:     $(MSWDIR)\region.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\region.cpp /BINARY region.obj
+
+registry.obj:     $(MSWDIR)\registry.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\registry.cpp /BINARY registry.obj
+
+regconf.obj:     $(MSWDIR)\regconf.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\regconf.cpp /BINARY regconf.obj
+
+scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\scrolbar.cpp /BINARY scrolbar.obj
+
+settings.obj:     $(MSWDIR)\settings.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\settings.cpp /BINARY settings.obj
+
+slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\slidrmsw.cpp /BINARY slidrmsw.obj
+
+slider95.obj:     $(MSWDIR)\slider95.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\slider95.cpp /BINARY slider95.obj
+
+spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\spinbutt.cpp /BINARY spinbutt.obj
+
+statbmp.obj:     $(MSWDIR)\statbmp.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbmp.cpp /BINARY statbmp.obj
+
+statbox.obj:     $(MSWDIR)\statbox.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbox.cpp /BINARY statbox.obj
+
+statbr95.obj:     $(MSWDIR)\statbr95.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\statbr95.cpp /BINARY statbr95.obj
+
+stattext.obj:     $(MSWDIR)\stattext.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\stattext.cpp /BINARY stattext.obj
+
+tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tabctrl.cpp /BINARY tabctrl.obj
+
+taskbar.obj:     $(MSWDIR)\taskbar.cpp
+        cl @<<
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\taskbar.cpp /BINARY taskbar.obj
+
+tbar95.obj:     $(MSWDIR)\tbar95.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tbar95.cpp /BINARY tbar95.obj
+
+tbarmsw.obj:     $(MSWDIR)\tbarmsw.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tbarmsw.cpp /BINARY tbarmsw.obj
+
+textctrl.obj:     $(MSWDIR)\textctrl.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\textctrl.cpp /BINARY textctrl.obj
+
+thread.obj:     $(MSWDIR)\thread.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\thread.cpp /BINARY thread.obj
+
+timer.obj:     $(MSWDIR)\timer.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\timer.cpp /BINARY timer.obj
+
+tooltip.obj:     $(MSWDIR)\tooltip.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\tooltip.cpp /BINARY tooltip.obj
+
+treectrl.obj:     $(MSWDIR)\treectrl.cpp
+        cl @<<
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\treectrl.cpp /BINARY treectrl.obj
+
+utils.obj:     $(MSWDIR)\utils.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\utils.cpp /BINARY utils.obj
+
+utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\utilsexc.cpp /BINARY utilsexc.obj
+
+wave.obj:     $(MSWDIR)\wave.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\wave.cpp /BINARY wave.obj
+
+window.obj:     $(MSWDIR)\window.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\window.cpp /BINARY window.obj
+
+xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\xpmhand.cpp /BINARY xpmhand.obj
+
+droptgt.obj:     $(OLEDIR)\droptgt.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\droptgt.cpp /BINARY droptgt.obj
+
+dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\dropsrc.cpp /BINARY dropsrc.obj
+
+dataobj.obj:     $(OLEDIR)\dataobj.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\dataobj.cpp /BINARY dataobj.obj
+
+oleutils.obj:     $(OLEDIR)\oleutils.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\oleutils.cpp /BINARY oleutils.obj
+
+uuid.obj:     $(OLEDIR)\uuid.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\uuid.cpp /BINARY uuid.obj
+
+automtn.obj:     $(OLEDIR)\automtn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(OLEDIR)\automtn.cpp /BINARY automtn.obj
+
+########################################################
+# Common objects (always compiled)
+
+cmndata.obj:     $(COMMDIR)\cmndata.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\cmndata.cpp /BINARY cmndata.obj
+
+config.obj:     $(COMMDIR)\config.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\config.cpp /BINARY config.obj
+
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dcbase.cpp /BINARY dcbase.obj
+
+db.obj:     $(COMMDIR)\db.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\db.cpp /BINARY db.obj
+
+dbtable.obj:     $(COMMDIR)\dbtable.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dbtable.cpp /BINARY dbtable.obj
+
+docview.obj:     $(COMMDIR)\docview.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\docview.cpp /BINARY docview.obj
+
+docmdi.obj:     $(COMMDIR)\docmdi.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\docmdi.cpp /BINARY docmdi.obj
+
+dynarray.obj:     $(COMMDIR)\dynarray.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dynarray.cpp /BINARY dynarray.obj
+
+dynlib.obj:     $(COMMDIR)\dynlib.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dynlib.cpp /BINARY dynlib.obj
+
+event.obj:     $(COMMDIR)\event.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\event.cpp /BINARY event.obj
+
+file.obj:     $(COMMDIR)\file.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\file.cpp /BINARY file.obj
+
+fileconf.obj:     $(COMMDIR)\fileconf.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\fileconf.cpp /BINARY fileconf.obj
+
+filefn.obj:     $(COMMDIR)\filefn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\filefn.cpp /BINARY filefn.obj
+
+framecmn.obj:     $(COMMDIR)\framecmn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\framecmn.cpp /BINARY framecmn.obj
+
+gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\gdicmn.cpp /BINARY gdicmn.obj
+
+image.obj:     $(COMMDIR)\image.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\image.cpp /BINARY image.obj
+
+intl.obj:     $(COMMDIR)\intl.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\intl.cpp /BINARY intl.obj
+
+ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\ipcbase.cpp /BINARY ipcbase.obj
+
+helpbase.obj:     $(COMMDIR)\helpbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\helpbase.cpp /BINARY helpbase.obj
+
+layout.obj:     $(COMMDIR)\layout.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\layout.cpp /BINARY layout.obj
+
+log.obj:     $(COMMDIR)\log.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\log.cpp /BINARY log.obj
+
+memory.obj:     $(COMMDIR)\memory.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\memory.cpp /BINARY memory.obj
+
+mimetype.obj:     $(COMMDIR)\mimetype.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\mimetype.cpp /BINARY mimetype.obj
+
+module.obj:     $(COMMDIR)\module.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\module.cpp /BINARY module.obj
+
+object.obj:     $(COMMDIR)\object.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\object.cpp /BINARY object.obj
+
+odbc.obj:     $(COMMDIR)\odbc.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\odbc.cpp /BINARY odbc.obj
+
+prntbase.obj:     $(COMMDIR)\prntbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\prntbase.cpp /BINARY prntbase.obj
+
+resource.obj:     $(COMMDIR)\resource.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\resource.cpp /BINARY resource.obj
+
+tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tbarbase.cpp /BINARY tbarbase.obj
+
+tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tbarsmpl.cpp /BINARY tbarsmpl.obj
+
+textfile.obj:     $(COMMDIR)\textfile.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\textfile.cpp /BINARY textfile.obj
+
+timercmn.obj:     $(COMMDIR)\timercmn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\timercmn.cpp /BINARY timercmn.obj
+
+utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\utilscmn.cpp /BINARY utilscmn.obj
+
+validate.obj:     $(COMMDIR)\validate.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\validate.cpp /BINARY validate.obj
+
+valgen.obj:     $(COMMDIR)\valgen.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\valgen.cpp /BINARY valgen.obj
+
+valtext.obj:     $(COMMDIR)\valtext.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\valtext.cpp /BINARY valtext.obj
+
+date.obj:     $(COMMDIR)\date.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\date.cpp /BINARY date.obj
+
+wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxexpr.cpp /BINARY wxexpr.obj
+
+hash.obj:     $(COMMDIR)\hash.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\hash.cpp /BINARY hash.obj
+
+list.obj:     $(COMMDIR)\list.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\list.cpp /BINARY list.obj
+
+paper.obj:     $(COMMDIR)\paper.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\paper.cpp /BINARY paper.obj
+
+string.obj:     $(COMMDIR)\string.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\string.cpp /BINARY string.obj
+
+socket.obj:     $(COMMDIR)\socket.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\socket.cpp /BINARY socket.obj
+
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckint.cpp /BINARY sckint.obj
+
+sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckaddr.cpp /BINARY sckaddr.obj
+
+sckfile.obj:     $(COMMDIR)\sckfile.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckfile.cpp /BINARY sckfile.obj
+
+sckipc.obj:     $(COMMDIR)\sckipc.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckipc.cpp /BINARY sckipc.obj
+
+sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckstrm.cpp /BINARY sckstrm.obj
+
+url.obj:     $(COMMDIR)\url.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\url.cpp /BINARY url.obj
+
+http.obj:     $(COMMDIR)\http.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\http.cpp /BINARY http.obj
+
+protocol.obj:     $(COMMDIR)\protocol.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\protocol.cpp /BINARY protocol.obj
+
+tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\tokenzr.cpp /BINARY tokenzr.obj
+
+matrix.obj:     $(COMMDIR)\matrix.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\matrix.cpp /BINARY matrix.obj
+
+time.obj:     $(COMMDIR)\time.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\time.cpp /BINARY time.obj
+
+stream.obj:     $(COMMDIR)\stream.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\stream.cpp /BINARY stream.obj
+
+wfstream.obj:     $(COMMDIR)\wfstream.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wfstream.cpp /BINARY wfstream.obj
+
+mstream.obj:     $(COMMDIR)\mstream.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\mstream.cpp /BINARY mstream.obj
+
+zstream.obj:     $(COMMDIR)\zstream.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\zstream.cpp /BINARY zstream.obj
+
+datstrm.obj:     $(COMMDIR)\datstrm.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\datstrm.cpp /BINARY datstrm.obj
+
+objstrm.obj:     $(COMMDIR)\objstrm.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\objstrm.cpp /BINARY objstrm.obj
+
+extended.obj:     $(COMMDIR)\extended.c
+  $(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c /BINARY extended.obj
+
+process.obj:     $(COMMDIR)\process.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\process.cpp /BINARY process.obj
+
+variant.obj:     $(COMMDIR)\variant.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\variant.cpp /BINARY variant.obj
+
+wincmn.obj:     $(COMMDIR)\wincmn.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wincmn.cpp /BINARY wincmn.obj
+
+wxchar.obj:     $(COMMDIR)\wxcharp.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxchar.cpp /BINARY wxchar.obj
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+choicdgg.obj:     $(GENDIR)\choicdgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\choicdgg.cpp /BINARY choicdgg.obj
+
+colrdlgg.obj:     $(GENDIR)\colrdgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\colrdgg.cpp /BINARY colordgg.obj
+
+dirdlgg.obj:     $(GENDIR)\dirdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\dirdlgg.cpp /BINARY dirdlgg.obj
+
+fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\fontdlgg.cpp /BINARY fontdlgg.obj
+
+gridg.obj:     $(GENDIR)\gridg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\gridg.cpp /BINARY gridg.obj
+
+helpxlp.obj:     $(GENDIR)\helpxlp.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\helpxlp.cpp /BINARY helpxlp.obj
+
+laywin.obj:     $(GENDIR)\laywin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\laywin.cpp /BINARY laywin.obj
+
+msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\msgdlgg.cpp /BINARY msgdlgg.obj
+
+panelg.obj:     $(GENDIR)\panelg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\panelg.cpp /BINARY panelg.obj
+
+printps.obj:     $(GENDIR)\printps.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\printps.cpp /BINARY printps.obj
+
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\progdlgg.cpp /BINARY progdlgg.obj
+
+prop.obj:     $(GENDIR)\prop.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prop.cpp /BINARY prop.obj
+
+propform.obj:     $(GENDIR)\propform.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\propform.cpp /BINARY propform.obj
+
+proplist.obj:     $(GENDIR)\proplist.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\proplist.cpp /BINARY proplist.obj
+
+prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prntdlgg.cpp /BINARY prntdlgg.obj
+
+sashwin.obj:     $(GENDIR)\sashwin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\sashwin.cpp /BINARY sashwin.obj
+
+scrolwin.obj:     $(GENDIR)\scrolwin.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\scrolwin.cpp /BINARY scrolwin.obj
+
+splitter.obj:     $(GENDIR)\splitter.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\splitter.cpp /BINARY splitter.obj
+
+statusbr.obj:     $(GENDIR)\statusbr.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\statusbr.cpp /BINARY statusbr.obj
+
+tabg.obj:     $(GENDIR)\tabg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\tabg.cpp /BINARY tabg.obj
+
+textdlgg.obj: $(GENDIR)\textdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\textdlgg.cpp /BINARY textdlgg.obj
+
+crbuffri.obj: $(XPMDIR)\crbuffri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crbuffri.c
+
+crbuffrp.obj: $(XPMDIR)\crbuffrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crbuffrp.c
+
+crdatfri.obj: $(XPMDIR)\crdatfri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crdatfri.c
+
+crdatfrp.obj: $(XPMDIR)\crdatfrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crdatfrp.c
+
+create.obj: $(XPMDIR)\create.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\create.c
+
+crifrbuf.obj: $(XPMDIR)\crifrbuf.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crifrbuf.c
+
+crifrdat.obj: $(XPMDIR)\crifrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crifrdat.c
+
+crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crpfrbuf.c
+
+crpfrdat.obj: $(XPMDIR)\crpfrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\crpfrdat.c
+
+dataxpm.obj: $(XPMDIR)\data.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\data.c /BINARY dataxpm.obj
+
+hashtab.obj: $(XPMDIR)\hashtab.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\hashtab.c
+
+misc.obj: $(XPMDIR)\misc.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\misc.c
+
+parse.obj: $(XPMDIR)\parse.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\parse.c
+
+rdftodat.obj: $(XPMDIR)\rdftodat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftodat.c
+
+rdftoi.obj: $(XPMDIR)\rdftoi.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftoi.c
+
+rdftop.obj: $(XPMDIR)\rdftop.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rdftop.c
+
+rgb.obj: $(XPMDIR)\rgb.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\rgb.c
+
+scan.obj: $(XPMDIR)\scan.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\scan.c
+
+simx.obj: $(XPMDIR)\simx.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\simx.c
+
+wrffrdat.obj: $(XPMDIR)\wrffrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffrdat.c
+
+wrffri.obj: $(XPMDIR)\wrffri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffri.c
+
+wrffrp.obj: $(XPMDIR)\wrffrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(XPMDIR)\wrffrp.c
+
+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
+
+
+y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+  $(CC) /ANSI_C $(CPPFLAGS) $(IFLAGS) /DEFINE USE_DEFINE $(COMMDIR)\y_tab.c /BINARY y_tab.obj
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+xpm:   
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_xpm:   
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+png:   
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_png:   
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+zlib:   
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_zlib:   
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+
--- a/src/msw/makefile.twn
+++ b/src/msw/makefile.twn
@@ -0,0 +1,326 @@
+#
+# File:		makefile.twn
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+#
+# Makefile for libwx.a, tagetting TWIN32
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/maketwin.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
+#   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
+XPMDIR=../xpm
+OLEDIR=ole
+MSWDIR=.
+
+GENERICOBJDIR=../generic/$(OBJDIR)
+COMMOBJDIR=../common/$(OBJDIR)
+OLEOBJDIR=ole/$(OBJDIR)
+MSWDIR=$(OBJDIR)
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= \
+  $(GENDIR)/choicdgg.$(OBJSUFF) \
+  $(GENDIR)/dirdlgg.$(OBJSUFF) \
+  $(GENDIR)/gridg.$(OBJSUFF) \
+  $(GENDIR)/laywin.$(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)/colrdlgg.$(OBJSUFF) \
+#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+
+COMMONOBJS = \
+  $(COMMDIR)/config.$(OBJSUFF) \
+  $(COMMDIR)/cmndata.$(OBJSUFF) \
+  $(COMMDIR)/dcbase.$(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)/image.$(OBJSUFF) \
+  $(COMMDIR)/imagbmp.$(OBJSUFF) \
+  $(COMMDIR)/imagpng.$(OBJSUFF) \
+  $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+  $(COMMDIR)/intl.$(OBJSUFF) \
+  $(COMMDIR)/ipcbase.$(OBJSUFF) \
+  $(COMMDIR)/layout.$(OBJSUFF) \
+  $(COMMDIR)/log.$(OBJSUFF) \
+  $(COMMDIR)/memory.$(OBJSUFF) \
+  $(COMMDIR)/module.$(OBJSUFF) \
+  $(COMMDIR)/mimetype.$(OBJSUFF) \
+  $(COMMDIR)/object.$(OBJSUFF) \
+  $(COMMDIR)/odbc.$(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)/valgen.$(OBJSUFF) \
+  $(COMMDIR)/valtext.$(OBJSUFF) \
+  $(COMMDIR)/date.$(OBJSUFF) \
+  $(COMMDIR)/wxexpr.$(OBJSUFF) \
+  $(COMMDIR)/hash.$(OBJSUFF) \
+  $(COMMDIR)/list.$(OBJSUFF) \
+  $(COMMDIR)/variant.$(OBJSUFF) \
+  $(COMMDIR)/paper.$(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)/wincmn.$(OBJSUFF)
+
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.
+#  $(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) \
+
+MSWOBJS = \
+  accel.$(OBJSUFF) \
+  app.$(OBJSUFF) \
+  bitmap.$(OBJSUFF) \
+  bmpbuttn.$(OBJSUFF) \
+  brush.$(OBJSUFF) \
+  button.$(OBJSUFF) \
+  checkbox.$(OBJSUFF) \
+  checklst.$(OBJSUFF) \
+  caret.$(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) \
+  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) \
+  tooltip.$(OBJSUFF) \
+  treectrl.$(OBJSUFF) \
+  utils.$(OBJSUFF) \
+  utilsexc.$(OBJSUFF) \
+  wave.$(OBJSUFF) \
+  window.$(OBJSUFF) \
+  xpmhand.$(OBJSUFF)
+
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+#  dirdlg.$(OBJSUFF) \
+
+# OLE not supported yet by GnuWin32
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF) \
+#  $(OLEDIR)/automtn.$(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) # $(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
+
+# 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
+        mv lex.yy.c $(COMMDIR)/lex_yy.c
+
+# The following may be required for FLEX
+#	$(LEX) -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
+
+# 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
+
+cleanall: clean
+
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -0,0 +1,782 @@
+#
+# File:		makefile.nt
+# Author:	Julian Smart
+# Created:	1997
+# Updated:
+# Copyright:	(c) 1997, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Arguments:
+#
+# FINAL=1 argument to nmake to build version with no debugging info.
+# dll builds a library (wxdll.lib) suitable for creating DLLs
+#
+!include <..\makevc.env>
+
+THISDIR=$(WXWIN)\src\msw
+
+!if "$(WXMAKINGDLL)" == "1"
+LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
+DUMMYOBJ=$D\dummydll.obj
+!else
+LIBTARGET=$(WXLIB)
+DUMMYOBJ=$D\dummy.obj
+!endif
+
+# Please set these according to the settings in setup.h, so we can include
+# the appropriate libraries in wx.lib
+
+# This one overrides the others, to be consistent with the settings in setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+# These are absolute paths, so that the compiler
+# generates correct __FILE__ symbols for debugging.
+# Otherwise you don't be able to double-click on a memory
+# error to load that file.
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+DOCDIR = $(WXDIR)\docs
+HTMLDIR = $(WXDIR)\src\html
+
+{..\generic}.cpp{..\generic\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\common}.cpp{..\common\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\msw}.cpp{..\msw\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\html}.cpp{..\html\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+GENERICOBJS= \
+  ..\generic\$D\choicdgg.obj \
+  ..\generic\$D\gridg.obj \
+  ..\generic\$D\laywin.obj \
+  ..\generic\$D\panelg.obj \
+  ..\generic\$D\progdlgg.obj \
+  ..\generic\$D\prop.obj \
+  ..\generic\$D\propform.obj \
+  ..\generic\$D\proplist.obj \
+  ..\generic\$D\sashwin.obj \
+  ..\generic\$D\scrolwin.obj \
+  ..\generic\$D\splitter.obj \
+  ..\generic\$D\statusbr.obj \
+  ..\generic\$D\tabg.obj \
+  ..\generic\$D\textdlgg.obj \
+  ..\generic\$D\extdlgg.obj \
+  ..\generic\$D\tipdlg.obj \
+  ..\generic\$D\busyinfo.obj
+
+#  ..\generic\$D\imaglist.obj \
+#  ..\generic\$D\treectrl.obj \
+#  ..\generic\$D\listctrl.obj \
+#  ..\generic\$D\notebook.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= \
+  ..\generic\$D\printps.obj \
+  ..\generic\$D\prntdlgg.obj \
+  ..\generic\$D\msgdlgg.obj \
+  ..\generic\$D\helpxlp.obj \
+  ..\generic\$D\colrdlgg.obj \
+  ..\generic\$D\fontdlgg.obj
+
+COMMONOBJS = \
+  ..\common\$D\cmndata.obj \
+  ..\common\$D\config.obj \
+  ..\common\$D\dcbase.obj \
+  ..\common\$D\db.obj \
+  ..\common\$D\dbtable.obj \
+  ..\common\$D\docview.obj \
+  ..\common\$D\docmdi.obj \
+  ..\common\$D\dynarray.obj \
+  ..\common\$D\dynlib.obj \
+  ..\common\$D\event.obj \
+  ..\common\$D\file.obj \
+  ..\common\$D\filefn.obj \
+  ..\common\$D\fileconf.obj \
+  ..\common\$D\framecmn.obj \
+  ..\common\$D\ftp.obj \
+  ..\common\$D\gdicmn.obj \
+  ..\common\$D\image.obj \
+  ..\common\$D\imagbmp.obj \
+  ..\common\$D\imagjpeg.obj \
+  ..\common\$D\imagpng.obj \
+  ..\common\$D\imaggif.obj \
+  ..\common\$D\intl.obj \
+  ..\common\$D\ipcbase.obj \
+  ..\common\$D\helpbase.obj \
+  ..\common\$D\layout.obj \
+  ..\common\$D\log.obj \
+  ..\common\$D\memory.obj \
+  ..\common\$D\mimetype.obj \
+  ..\common\$D\module.obj \
+  ..\common\$D\odbc.obj \
+  ..\common\$D\object.obj \
+  ..\common\$D\prntbase.obj \
+  ..\common\$D\resource.obj \
+  ..\common\$D\tbarbase.obj \
+  ..\common\$D\tbarsmpl.obj \
+  ..\common\$D\textfile.obj \
+  ..\common\$D\timercmn.obj \
+  ..\common\$D\utilscmn.obj \
+  ..\common\$D\validate.obj \
+  ..\common\$D\valgen.obj \
+  ..\common\$D\valtext.obj \
+  ..\common\$D\date.obj \
+  ..\common\$D\hash.obj \
+  ..\common\$D\list.obj \
+  ..\common\$D\paper.obj \
+  ..\common\$D\string.obj \
+  ..\common\$D\socket.obj \
+  ..\common\$D\sckaddr.obj \
+  ..\common\$D\sckint.obj \
+  ..\common\$D\sckfile.obj \
+  ..\common\$D\sckipc.obj \
+  ..\common\$D\sckstrm.obj \
+  ..\common\$D\url.obj \
+  ..\common\$D\http.obj \
+  ..\common\$D\protocol.obj \
+  ..\common\$D\time.obj \
+  ..\common\$D\tokenzr.obj \
+  ..\common\$D\wxexpr.obj \
+  ..\common\$D\y_tab.obj \
+  ..\common\$D\extended.obj \
+  ..\common\$D\process.obj \
+  ..\common\$D\wfstream.obj \
+  ..\common\$D\mstream.obj \
+  ..\common\$D\zstream.obj \
+  ..\common\$D\stream.obj \
+  ..\common\$D\datstrm.obj \
+  ..\common\$D\objstrm.obj \
+  ..\common\$D\variant.obj \
+  ..\common\$D\dlgcmn.obj \
+  ..\common\$D\wincmn.obj \
+  ..\common\$D\txtstrm.obj \
+  ..\common\$D\wxchar.obj \
+  ..\common\$D\unzip.obj \
+  ..\common\$D\zipstream.obj \
+  ..\common\$D\filesys.obj \
+  ..\common\$D\fs_inet.obj \
+  ..\common\$D\fs_zip.obj
+
+MSWOBJS = \
+  ..\msw\$D\accel.obj \
+  ..\msw\$D\app.obj \
+  ..\msw\$D\bitmap.obj \
+  ..\msw\$D\bmpbuttn.obj \
+  ..\msw\$D\brush.obj \
+  ..\msw\$D\button.obj \
+  ..\msw\$D\checkbox.obj \
+  ..\msw\$D\checklst.obj \
+  ..\msw\$D\caret.obj \
+  ..\msw\$D\choice.obj \
+  ..\msw\$D\clipbrd.obj \
+  ..\msw\$D\colordlg.obj \
+  ..\msw\$D\colour.obj \
+  ..\msw\$D\combobox.obj \
+  ..\msw\$D\control.obj \
+  ..\msw\$D\curico.obj \
+  ..\msw\$D\cursor.obj \
+  ..\msw\$D\data.obj \
+  ..\msw\$D\dc.obj \
+  ..\msw\$D\dcmemory.obj \
+  ..\msw\$D\dcclient.obj \
+  ..\msw\$D\dcprint.obj \
+  ..\msw\$D\dcscreen.obj \
+  ..\msw\$D\dde.obj \
+  ..\msw\$D\dialog.obj \
+  ..\msw\$D\dib.obj \
+  ..\msw\$D\dibutils.obj \
+  ..\msw\$D\dirdlg.obj \
+  ..\msw\$D\dragimag.obj \
+  ..\msw\$D\filedlg.obj \
+  ..\msw\$D\font.obj \
+  ..\msw\$D\fontdlg.obj \
+  ..\msw\$D\frame.obj \
+  ..\msw\$D\gauge95.obj \
+  ..\msw\$D\gaugemsw.obj \
+  ..\msw\$D\gdiobj.obj \
+  ..\msw\$D\helpwin.obj \
+  ..\msw\$D\icon.obj \
+  ..\msw\$D\iniconf.obj \
+  ..\msw\$D\joystick.obj \
+  ..\msw\$D\imaglist.obj \
+  ..\msw\$D\listbox.obj \
+  ..\msw\$D\listctrl.obj \
+  ..\msw\$D\main.obj \
+  ..\msw\$D\mdi.obj \
+  ..\msw\$D\menu.obj \
+  ..\msw\$D\menuitem.obj \
+  ..\msw\$D\metafile.obj \
+  ..\msw\$D\minifram.obj \
+  ..\msw\$D\msgdlg.obj \
+  ..\msw\$D\nativdlg.obj \
+  ..\msw\$D\notebook.obj \
+  ..\msw\$D\ownerdrw.obj \
+  ..\msw\$D\palette.obj \
+  ..\msw\$D\pen.obj \
+  ..\msw\$D\penwin.obj \
+  ..\msw\$D\pnghand.obj \
+  ..\msw\$D\printdlg.obj \
+  ..\msw\$D\printwin.obj \
+  ..\msw\$D\radiobox.obj \
+  ..\msw\$D\radiobut.obj \
+  ..\msw\$D\region.obj \
+  ..\msw\$D\registry.obj \
+  ..\msw\$D\regconf.obj \
+  ..\msw\$D\scrolbar.obj \
+  ..\msw\$D\settings.obj \
+  ..\msw\$D\slidrmsw.obj \
+  ..\msw\$D\slider95.obj \
+  ..\msw\$D\spinbutt.obj \
+  ..\msw\$D\statbmp.obj \
+  ..\msw\$D\statbox.obj \
+  ..\msw\$D\statline.obj \
+  ..\msw\$D\statbr95.obj \
+  ..\msw\$D\stattext.obj \
+  ..\msw\$D\tabctrl.obj \
+  ..\msw\$D\taskbar.obj \
+  ..\msw\$D\tbar95.obj \
+  ..\msw\$D\tbarmsw.obj \
+  ..\msw\$D\textctrl.obj \
+  ..\msw\$D\thread.obj \
+  ..\msw\$D\timer.obj \
+  ..\msw\$D\tooltip.obj \
+  ..\msw\$D\treectrl.obj \
+  ..\msw\$D\utils.obj \
+  ..\msw\$D\utilsexc.obj \
+  ..\msw\ole\$D\uuid.obj \
+  ..\msw\$D\wave.obj \
+  ..\msw\$D\window.obj \
+  ..\msw\$D\xpmhand.obj \
+  ..\msw\ole\$D\dataobj.obj \
+  ..\msw\ole\$D\automtn.obj \
+  ..\msw\ole\$D\droptgt.obj \
+  ..\msw\ole\$D\dropsrc.obj \
+  ..\msw\ole\$D\oleutils.obj
+
+HTMLOBJS = \
+  ..\html\$D\htmlcell.obj \
+  ..\html\$D\htmlfilter.obj \
+  ..\html\$D\htmlhelp.obj \
+  ..\html\$D\htmlhelp_io.obj \
+  ..\html\$D\htmlparser.obj \
+  ..\html\$D\htmltag.obj \
+  ..\html\$D\htmlwin.obj \
+  ..\html\$D\htmlwinparser.obj \
+  ..\html\$D\mod_fonts.obj \
+  ..\html\$D\mod_hline.obj \
+  ..\html\$D\mod_image.obj \
+  ..\html\$D\mod_layout.obj \
+  ..\html\$D\mod_links.obj \
+  ..\html\$D\mod_list.obj \
+  ..\html\$D\mod_pre.obj \
+  ..\html\$D\mod_tables.obj \
+  ..\html\$D\search.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+# Add $(HTMLOBJS) if wanting wxHTML classes
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) 
+
+# Normal, static library
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+
+
+test:   $(MSWDIR)\$D\wave.obj
+test2:  ..\common\Debug\config.obj
+
+$D:
+    mkdir $D
+
+$(COMMDIR)\$D:
+    mkdir $(COMMDIR)\$D
+
+$(MSWDIR)\$D:
+    mkdir $(MSWDIR)\$D
+
+$(GENDIR)\$D:
+    mkdir $(GENDIR)\$D
+
+$(OLEDIR)\$D:
+    mkdir $(OLEDIR)\$D
+
+$(HTMLDIR)\$D:
+    mkdir $(HTMLDIR)\$D
+
+# wxWindows library as DLL
+dll:
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+cleandll:
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+# wxWindows + app as DLL. Only affects main.cpp.
+dllapp:
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
+
+# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
+dllnp:
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
+
+# Use this to make dummy.obj and generate a PCH.
+# You might use the dll target, then the pch target, in order to
+# generate a DLL, then a PCH/dummy.obj for compiling your applications with.
+#
+# Explanation: Normally, when compiling a static version of wx.lib, your dummy.obj/PCH
+# are associated with wx.lib. When using a DLL version of wxWindows, however,
+# the DLL is compiled without a PCH, so you only need it for compiling the app.
+# In fact headers are compiled differently depending on whether a DLL is being made
+# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
+# in each case) so you couldn't use the same PCH.
+pch:
+        nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+pch1:   dirs $(DUMMYOBJ)
+    echo $(DUMMYOBJ)
+
+!if "$(WXMAKINGDLL)" != "1"
+
+### Static library
+
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+	-erase $(LIBTARGET)
+	$(implib) @<<
+-out:$@
+-machine:$(CPU)
+$(OBJECTS) $(PERIPH_LIBS)
+<<
+
+!else
+
+### Update the import library
+
+$(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
+    $(implib) @<<
+    -machine:$(CPU)
+    -def:wx.def
+    $(DUMMYOBJ) $(OBJECTS)
+    -out:$(WXDIR)\lib\$(WXLIBNAME).lib
+<<
+
+# Update the dynamic link library
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+    $(link) @<<
+    $(LINKFLAGS)
+    -out:$(WXDIR)\lib\$(WXLIBNAME).dll
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib
+<<
+
+!endif
+
+
+########################################################
+# Windows-specific objects
+
+$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
+
+$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+        cl @<<
+$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
+<<
+
+# If taking wxWindows from CVS, setup.h doesn't exist yet.
+# Actually the 'if not exist setup.h' test doesn't work
+# (copies the file anyway)
+# we'll have to comment this rule out.
+
+#$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+#    cd "$(WXDIR)"\include\wx\msw
+#    if not exist setup.h copy setup0.h setup.h
+#    cd "$(WXDIR)"\src\msw
+
+..\common\$D\extended.obj:     ..\common\extended.c
+        cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\extended.c /Fo$@
+<<
+
+..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
+        cl @<<
+$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+<<
+
+..\common\y_tab.c:     ..\common\dosyacc.c
+        copy "..\common"\dosyacc.c "..\common"\y_tab.c
+
+..\common\lex_yy.c:    ..\common\doslex.c
+    copy "..\common"\doslex.c "..\common"\lex_yy.c
+
+$(OBJECTS):	$(WXDIR)/include/wx/setup.h
+
+..\common\$D\unzip.obj:     ..\common\unzip.c
+        cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
+<<
+
+# Peripheral components
+
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\msw
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\msw
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\msw
+
+clean_xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+rcparser:
+    cd $(WXDIR)\utils\rcparser\src
+    nmake -f makefile.vc FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+        -erase $(LIBTARGET)
+        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
+        -erase ..\..\lib\wx200.dll
+        -erase ..\..\lib\wx200.lib
+        -erase ..\..\lib\wx200.exp
+        -erase ..\..\lib\wx200.pdb
+        -erase ..\..\lib\wx200.ilk
+        -erase *.pdb
+        -erase *.sbr
+        -erase $(WXLIBNAME).pch
+        -erase $(GENDIR)\$D\*.obj
+        -erase $(GENDIR)\$D\*.pdb
+        -erase $(GENDIR)\$D\*.sbr
+        -erase $(COMMDIR)\$D\*.obj
+        -erase $(COMMDIR)\$D\*.pdb
+        -erase $(COMMDIR)\$D\*.sbr
+        -erase $(COMMDIR)\\y_tab.c
+        -erase $(COMMDIR)\lex_yy.c
+        -erase $(MSWDIR)\$D\*.obj
+        -erase $(MSWDIR)\$D\*.sbr
+        -erase $(MSWDIR)\$D\*.pdb
+        -erase $(OLEDIR)\$D\*.obj
+        -erase $(OLEDIR)\$D\*.sbr
+        -erase $(OLEDIR)\$D\*.pdb
+        -rmdir $(D)
+        -rmdir ole\$(D)
+        -rmdir ..\generic\$(D)
+        -rmdir ..\common\$(D)
+
+cleanall: clean
+
+# Making documents
+docs:   allhlp allhtml allpdfrtf
+alldocs: docs
+hlp:    wxhlp portinghlp
+wxhlp:  $(DOCDIR)/winhelp/wx.hlp
+prophlp: $(DOCDIR)/winhelp/prop.hlp
+refhlp: $(DOCDIR)/winhelp/techref.hlp
+rtf:    $(DOCDIR)/winhelp/wx.rtf
+proprtf: $(DOCDIR)/winhelp/prop.rtf
+pdfrtf:    $(DOCDIR)/pdf/wx.rtf
+proppdfrtf: $(DOCDIR)/pdf/prop.rtf
+refpdfrtf: $(DOCDIR)/pdf/techref.rtf
+html:	wxhtml portinghtml
+wxhtml:	$(DOCDIR)\html\wx\wx.htm
+htmlhelp: $(DOCDIR)\html\wx\wx.chm
+prophtml: $(DOCDIR)\html\proplist\prop.htm
+ps:     wxps referencps
+wxps:	$(WXDIR)\docs\ps\wx.ps
+propps:	$(WXDIR)\docs\ps\prop.ps
+referencps:	$(WXDIR)\docs\ps\referenc.ps
+
+portinghtml: $(DOCDIR)\html\porting\port.htm
+portingrtf: $(DOCDIR)/winhelp/porting.rtf
+portinghlp: $(DOCDIR)/winhelp/porting.hlp
+portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
+portingps:	$(WXDIR)\docs\ps\porting.ps
+
+allhlp: wxhlp portinghlp prophlp
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc hlp
+        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\wxhelp\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxgraph\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxchart\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxbuild\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxgrid\src
+#        nmake -f makefile.vc hlp
+
+allhtml: wxhtml portinghtml prophtml
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc html
+        cd $(THISDIR)
+
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\hytext\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\wxhelp\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\wxgraph\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\wxchart\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc html
+
+allps: wxps referencps portingps propps
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc ps
+        cd $(THISDIR)
+
+allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc pdfrtf
+        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\wxhelp\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxgraph\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxchart\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc ps
+#        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
+        cd $(DOCDIR)/latex/wx
+        -erase wx.ph
+        hc wx
+        move wx.hlp $(DOCDIR)\winhelp\wx.hlp
+        move wx.cnt $(DOCDIR)\winhelp\wx.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
+        cd $(DOCDIR)/latex/porting
+        -erase porting.ph
+        hc porting
+        move porting.hlp $(DOCDIR)\winhelp\porting.hlp
+        move porting.cnt $(DOCDIR)\winhelp\porting.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
+        cd $(DOCDIR)/latex/proplist
+        -erase prop.ph
+        hc prop
+        move prop.hlp $(DOCDIR)\winhelp\prop.hlp
+        move prop.cnt $(DOCDIR)\winhelp\prop.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
+        cd $(DOCDIR)/latex/techref
+        -erase techref.ph
+        hc techref
+        move techref.hlp $(DOCDIR)\winhelp\techref.hlp
+        move techref.cnt $(DOCDIR)\winhelp\techref.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
+        cd $(DOCDIR)\latex\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/porting/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
+        cd $(DOCDIR)\latex\porting
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/proplist/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
+        cd $(DOCDIR)\latex\techref
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
+        cd $(DOCDIR)\latex\wx
+        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
+        cd $(DOCDIR)\latex\porting
+        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
+        cd $(DOCDIR)\latex\techref
+        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
+        cd $(DOCDIR)\latex\wx
+        -mkdir $(DOCDIR)\html\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
+        -erase $(DOCDIR)\html\wx\*.con
+        -erase $(DOCDIR)\html\wx\*.ref
+        -erase $(DOCDIR)\latex\wx\*.con
+        -erase $(DOCDIR)\latex\wx\*.ref
+         cd $(THISDIR)
+
+$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+	cd $(DOCDIR)\html\wx
+	-hhc wx.hhp
+	cd $(THISDIR)
+
+
+$(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
+        cd $(DOCDIR)\latex\porting
+        -mkdir $(DOCDIR)\html\porting
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
+        -erase $(DOCDIR)\html\porting\*.con
+        -erase $(DOCDIR)\html\porting\*.ref
+        -erase $(DOCDIR)\latex\porting\*.con
+        -erase $(DOCDIR)\latex\porting\*.ref
+        cd $(THISDIR)
+
+$(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -mkdir $(DOCDIR)\html\proplist
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
+        -erase $(DOCDIR)\html\proplist\*.con
+        -erase $(DOCDIR)\html\proplist\*.ref
+        -erase $(DOCDIR)\latex\proplist\*.con
+        -erase $(DOCDIR)\latex\proplist\*.ref
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+	cd $(WXDIR)\docs\latex\wx
+        -latex manual
+        -latex manual
+        -makeindx manual
+        -bibtex manual
+        -latex manual
+        -latex manual
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\porting\porting.dvi:	$(DOCDIR)/latex/porting/porting.tex
+	cd $(WXDIR)\docs\latex\porting
+        -latex porting
+        -latex porting
+        -makeindx porting
+        -bibtex porting
+        -latex porting
+        -latex porting
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\wx.ps:	$(WXDIR)\docs\latex\wx\manual.dvi
+	cd $(WXDIR)\docs\latex\wx
+        -dvips32 -o wx.ps manual
+        move wx.ps $(WXDIR)\docs\ps\wx.ps
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\porting.ps:	$(WXDIR)\docs\latex\porting\porting.dvi
+	cd $(WXDIR)\docs\latex\porting
+        -dvips32 -o porting.ps porting
+        move porting.ps $(WXDIR)\docs\ps\porting.ps
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+	cd $(WXDIR)\docs\latex\wx
+        -latex referenc
+        -latex referenc
+        -makeindx referenc
+        -bibtex referenc
+        -latex referenc
+        -latex referenc
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
+	cd $(WXDIR)\docs\latex\wx
+        -dvips32 -o referenc.ps referenc
+        move referenc.ps $(WXDIR)\docs\ps\referenc.ps
+        cd $(THISDIR)
+
+# In order to force document reprocessing
+touchmanual:
+    -touch $(WXDIR)\docs\latex\wx\manual.tex
+
+updatedocs: touchmanual alldocs
+
+# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
+# Office StartUp folder, and PDFMaker should be installed.
+updatepdf:  # touchmanual pdfrtf
+    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -0,0 +1,961 @@
+#!/binb/wmake.exe
+#
+# File:		makefile.wat
+# Author:	Julian Smart
+# Created:	1998
+#
+# Makefile : Builds wxWindows library for Watcom C++, WIN32
+
+WXDIR = ..\..
+
+!include $(WXDIR)\src\makewat.env
+
+WXLIB = $(WXDIR)\lib
+
+LIBTARGET   = $(WXLIB)\wx.lib
+DUMMY=dummydll
+# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
+
+EXTRATARGETS = xpm png zlib
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= choicdgg.obj &
+  gridg.obj &
+  laywin.obj &
+  panelg.obj &
+  progdlgg.obj &
+  prop.obj &
+  propform.obj &
+  proplist.obj &
+  sashwin.obj &
+  scrolwin.obj &
+  splitter.obj &
+  statusbr.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
+
+COMMONOBJS = cmndata.obj &
+  config.obj &
+  dcbase.obj &
+  docview.obj &
+  docmdi.obj &
+  dynarray.obj &
+  dynlib.obj &
+  event.obj &
+  file.obj &
+  filefn.obj &
+  fileconf.obj &
+  framecmn.obj &
+  gdicmn.obj &
+  image.obj &
+  imagbmp.obj &
+  imagpng.obj &
+  intl.obj &
+  ipcbase.obj &
+  helpbase.obj &
+  layout.obj &
+  log.obj &
+  memory.obj &
+  mimetype.obj &
+  module.obj &
+  object.obj &
+  prntbase.obj &
+  resource.obj &
+  tbarbase.obj &
+  tbarsmpl.obj &
+  textfile.obj &
+  timercmn.obj &
+  utilscmn.obj &
+  validate.obj &
+  valgen.obj &
+  valtext.obj &
+  date.obj &
+  hash.obj &
+  list.obj &
+  paper.obj &
+  string.obj &
+  socket.obj &
+  sckaddr.obj &
+  sckfile.obj &
+  sckipc.obj &
+  sckstrm.obj &
+  sckint.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 &
+  dlgcmn.obj &
+  wincmn.obj &
+  wxchar.obj
+
+# Can't compile these yet under Watcom C++
+#  imagjpeg.obj &
+#  odbc.obj &
+#  db.obj &
+#  dbtable.obj &
+
+MSWOBJS = &
+  accel.obj &
+  app.obj &
+  bitmap.obj &
+  bmpbuttn.obj &
+  brush.obj &
+  button.obj &
+  checkbox.obj &
+  checklst.obj &
+  caret.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 &
+  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 &
+  statline.obj &
+  statbr95.obj &
+  stattext.obj &
+  tabctrl.obj &
+  taskbar.obj &
+  tbar95.obj &
+  tbarmsw.obj &
+  textctrl.obj &
+  thread.obj &
+  timer.obj &
+  tooltip.obj &
+  treectrl.obj &
+  utils.obj &
+  utilsexc.obj &
+  wave.obj &
+  window.obj &
+  xpmhand.obj
+
+#  pnghand.obj &
+
+OLEOBJS = &
+  droptgt.obj &
+  dropsrc.obj &
+  dataobj.obj &
+  oleutils.obj &
+  uuid.obj &
+  automtn.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)
+
+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 $(EXTRATARGETSCLEAN)
+    -erase *.obj
+    -erase $(LIBTARGET)
+    -erase *.pch
+    -erase *.err
+    -erase *.lbc
+
+cleanall:   clean
+
+accel.obj:     $(MSWDIR)\accel.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+app.obj:     $(MSWDIR)\app.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+bitmap.obj:     $(MSWDIR)\bitmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+brush.obj:     $(MSWDIR)\brush.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+button.obj:     $(MSWDIR)\button.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+caret.obj:     $(MSWDIR)\caret.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+choice.obj:     $(MSWDIR)\choice.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+checkbox.obj:     $(MSWDIR)\checkbox.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+checklst.obj:     $(MSWDIR)\checklst.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+clipbrd.obj:     $(MSWDIR)\clipbrd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+colordlg.obj:     $(MSWDIR)\colordlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+colour.obj:     $(MSWDIR)\colour.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+combobox.obj:     $(MSWDIR)\combobox.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+control.obj:     $(MSWDIR)\control.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+curico.obj:     $(MSWDIR)\curico.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+cursor.obj:     $(MSWDIR)\cursor.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+data.obj:     $(MSWDIR)\data.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dde.obj:     $(MSWDIR)\dde.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dc.obj:     $(MSWDIR)\dc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcclient.obj:     $(MSWDIR)\dcclient.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcprint.obj:     $(MSWDIR)\dcprint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcscreen.obj:     $(MSWDIR)\dcscreen.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dialog.obj:     $(MSWDIR)\dialog.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dib.obj:     $(MSWDIR)\dib.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dibutils.obj:     $(MSWDIR)\dibutils.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+filedlg.obj:     $(MSWDIR)\filedlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+font.obj:     $(MSWDIR)\font.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontdlg.obj:     $(MSWDIR)\fontdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+frame.obj:     $(MSWDIR)\frame.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gauge95.obj:     $(MSWDIR)\gauge95.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+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
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+iniconf.obj:     $(MSWDIR)\iniconf.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+joystick.obj:     $(MSWDIR)\joystick.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+listbox.obj:     $(MSWDIR)\listbox.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+listctrl.obj:     $(MSWDIR)\listctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+main.obj:     $(MSWDIR)\main.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+mdi.obj:     $(MSWDIR)\mdi.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+menu.obj:     $(MSWDIR)\menu.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+menuitem.obj:     $(MSWDIR)\menuitem.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+metafile.obj:     $(MSWDIR)\metafile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+minifram.obj:     $(MSWDIR)\minifram.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+notebook.obj:     $(MSWDIR)\notebook.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+palette.obj:     $(MSWDIR)\palette.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+pen.obj:     $(MSWDIR)\pen.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+penwin.obj:     $(MSWDIR)\penwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+pnghand.obj:     $(MSWDIR)\pnghand.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+printdlg.obj:     $(MSWDIR)\printdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+printwin.obj:     $(MSWDIR)\printwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+radiobox.obj:     $(MSWDIR)\radiobox.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+radiobut.obj:     $(MSWDIR)\radiobut.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+region.obj:     $(MSWDIR)\region.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+registry.obj:     $(MSWDIR)\registry.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+regconf.obj:     $(MSWDIR)\regconf.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+settings.obj:     $(MSWDIR)\settings.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+slider95.obj:     $(MSWDIR)\slider95.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+statbmp.obj:     $(MSWDIR)\statbmp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+statbox.obj:     $(MSWDIR)\statbox.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+statline.obj:     $(MSWDIR)\statline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+statbr95.obj:     $(MSWDIR)\statbr95.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+stattext.obj:     $(MSWDIR)\stattext.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+taskbar.obj:     $(MSWDIR)\taskbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tbar95.obj:     $(MSWDIR)\tbar95.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tbarmsw.obj:     $(MSWDIR)\tbarmsw.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+textctrl.obj:     $(MSWDIR)\textctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+thread.obj:     $(MSWDIR)\thread.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+timer.obj:     $(MSWDIR)\timer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+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) $<
+
+wave.obj:     $(MSWDIR)\wave.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+window.obj:     $(MSWDIR)\window.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+droptgt.obj:     $(OLEDIR)\droptgt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dataobj.obj:     $(OLEDIR)\dataobj.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+oleutils.obj:     $(OLEDIR)\oleutils.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+uuid.obj:     $(OLEDIR)\uuid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+automtn.obj:     $(OLEDIR)\automtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+########################################################
+# Common objects (always compiled)
+
+cmndata.obj:     $(COMMDIR)\cmndata.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+config.obj:     $(COMMDIR)\config.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcbase.obj:     $(COMMDIR)\dcbase.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
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+docmdi.obj:     $(COMMDIR)\docmdi.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dynarray.obj:     $(COMMDIR)\dynarray.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dynlib.obj:     $(COMMDIR)\dynlib.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+event.obj:     $(COMMDIR)\event.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+file.obj:     $(COMMDIR)\file.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fileconf.obj:     $(COMMDIR)\fileconf.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+filefn.obj:     $(COMMDIR)\filefn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+framecmn.obj:     $(COMMDIR)\framecmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+image.obj:     $(COMMDIR)\image.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
+  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
+
+imagpng.obj:     $(COMMDIR)\imagpng.cpp
+  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
+
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+intl.obj:     $(COMMDIR)\intl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpbase.obj:     $(COMMDIR)\helpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+layout.obj:     $(COMMDIR)\layout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+log.obj:     $(COMMDIR)\log.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+memory.obj:     $(COMMDIR)\memory.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+mimetype.obj:     $(COMMDIR)\mimetype.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+module.obj:     $(COMMDIR)\module.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+object.obj:     $(COMMDIR)\object.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+odbc.obj:     $(COMMDIR)\odbc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+prntbase.obj:     $(COMMDIR)\prntbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+resource.obj:     $(COMMDIR)\resource.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+textfile.obj:     $(COMMDIR)\textfile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+timercmn.obj:     $(COMMDIR)\timercmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+validate.obj:     $(COMMDIR)\validate.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+valgen.obj:     $(COMMDIR)\valgen.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+valtext.obj:     $(COMMDIR)\valtext.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+date.obj:     $(COMMDIR)\date.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+hash.obj:     $(COMMDIR)\hash.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+list.obj:     $(COMMDIR)\list.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+paper.obj:     $(COMMDIR)\paper.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+string.obj:     $(COMMDIR)\string.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+socket.obj:     $(COMMDIR)\socket.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckfile.obj:     $(COMMDIR)\sckfile.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
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+http.obj:     $(COMMDIR)\http.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+protocol.obj:     $(COMMDIR)\protocol.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+matrix.obj:     $(COMMDIR)\matrix.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+time.obj:     $(COMMDIR)\time.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+stream.obj:     $(COMMDIR)\stream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wfstream.obj:     $(COMMDIR)\wfstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+mstream.obj:     $(COMMDIR)\mstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zstream.obj:     $(COMMDIR)\zstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datstrm.obj:     $(COMMDIR)\datstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+objstrm.obj:     $(COMMDIR)\objstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+extended.obj:     $(COMMDIR)\extended.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
+
+process.obj:     $(COMMDIR)\process.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+variant.obj:     $(COMMDIR)\variant.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wincmn.obj:     $(COMMDIR)\wincmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+wxchar.obj:     $(COMMDIR)\wxchar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
+
+#  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+choicdgg.obj:     $(GENDIR)\choicdgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+colrdlgg.obj:     $(GENDIR)\colrdgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gridg.obj:     $(GENDIR)\gridg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpxlp.obj:     $(GENDIR)\helpxlp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+laywin.obj:     $(GENDIR)\laywin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+panelg.obj:     $(GENDIR)\panelg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+printps.obj:     $(GENDIR)\printps.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+prop.obj:     $(GENDIR)\prop.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+propform.obj:     $(GENDIR)\propform.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+proplist.obj:     $(GENDIR)\proplist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sashwin.obj:     $(GENDIR)\sashwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+scrolwin.obj:     $(GENDIR)\scrolwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+splitter.obj:     $(GENDIR)\splitter.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+statusbr.obj:     $(GENDIR)\statusbr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tabg.obj:     $(GENDIR)\tabg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+textdlgg.obj: $(GENDIR)\textdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+tipdlg.obj: $(GENDIR)\tipdlg.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) $<
+
+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) $<
+
+misc.obj: $(XPMDIR)\misc.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+parse.obj: $(XPMDIR)\parse.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftodat.obj: $(XPMDIR)\rdftodat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftoi.obj: $(XPMDIR)\rdftoi.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftop.obj: $(XPMDIR)\rdftop.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rgb.obj: $(XPMDIR)\rgb.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+scan.obj: $(XPMDIR)\scan.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+simx.obj: $(XPMDIR)\simx.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffrdat.obj: $(XPMDIR)\wrffrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffri.obj: $(XPMDIR)\wrffri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffrp.obj: $(XPMDIR)\wrffrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O) 
+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
+
+clean_png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    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
+