]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.bcc
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env
[wxWidgets.git] / src / msw / makefile.bcc
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 70b465d6cfcbf89a1d3efb7c6a31d8335f58278e..61f092e60d8bca66610e51d0e498ff5b7bfeb8cb 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,9 +1,14 @@
+
+
+# This file was automatically generated by tmake at 21:02, 2001/06/26
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
+
 #
 #
-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# File:     makefile.bcc
+# Author:   Julian Smart
+# Created:  1993
+# Updated:
+# Copyright:(c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #
@@ -19,7 +24,7 @@
 !endif
 
 !if "$(CFG)" == ""
 !endif
 
 !if "$(CFG)" == ""
-#!error You must start compiling from wx\src, not wx\src\msw.
+# !error You must start compiling from wx\src, not wx\src\msw.
 !endif
 
 !ifndef DEBUG
 !endif
 
 !ifndef DEBUG
@@ -35,20 +40,13 @@ 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
 # 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=
 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)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 # TODO: add these libraries
 !endif
 
 # TODO: add these libraries
@@ -68,204 +66,218 @@ MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
 
 
 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 \
+GENERICOBJS= $(MSWDIR)\busyinfo.obj \
+               $(MSWDIR)\calctrl.obj \
+               $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dirctrlg.obj \
+               $(MSWDIR)\dirdlgg.obj \
+               $(MSWDIR)\dragimgg.obj \
+               $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
+               $(MSWDIR)\gridsel.obj \
+               $(MSWDIR)\imaglist.obj \
+               $(MSWDIR)\laywin.obj \
+               $(MSWDIR)\listctrl.obj \
+               $(MSWDIR)\logg.obj \
+               $(MSWDIR)\notebook.obj \
+               $(MSWDIR)\numdlgg.obj \
+               $(MSWDIR)\panelg.obj \
+               $(MSWDIR)\prntdlgg.obj \
+               $(MSWDIR)\progdlgg.obj \
+               $(MSWDIR)\prop.obj \
+               $(MSWDIR)\propform.obj \
+               $(MSWDIR)\proplist.obj \
+               $(MSWDIR)\sashwin.obj \
+               $(MSWDIR)\scrolwin.obj \
+               $(MSWDIR)\splash.obj \
+               $(MSWDIR)\splitter.obj \
+               $(MSWDIR)\statusbr.obj \
+               $(MSWDIR)\tabg.obj \
+               $(MSWDIR)\tbarsmpl.obj \
+               $(MSWDIR)\textdlgg.obj \
+               $(MSWDIR)\tipdlg.obj \
+               $(MSWDIR)\tipwin.obj \
+               $(MSWDIR)\treectlg.obj \
+               $(MSWDIR)\treelay.obj \
+               $(MSWDIR)\wizard.obj
 
 COMMONOBJS = \
 
 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 \
+               $(MSWDIR)\y_tab.obj \
+               $(MSWDIR)\appcmn.obj \
+               $(MSWDIR)\choiccmn.obj \
+               $(MSWDIR)\clipcmn.obj \
+               $(MSWDIR)\cmdline.obj \
+               $(MSWDIR)\cmdproc.obj \
+               $(MSWDIR)\cmndata.obj \
+               $(MSWDIR)\config.obj \
+               $(MSWDIR)\cshelp.obj \
+               $(MSWDIR)\ctrlcmn.obj \
+               $(MSWDIR)\ctrlsub.obj \
+               $(MSWDIR)\datetime.obj \
+               $(MSWDIR)\datstrm.obj \
+               $(MSWDIR)\dcbase.obj \
+               $(MSWDIR)\dircmn.obj \
+               $(MSWDIR)\dlgcmn.obj \
+               $(MSWDIR)\dndcmn.obj \
+               $(MSWDIR)\dobjcmn.obj \
+               $(MSWDIR)\docmdi.obj \
+               $(MSWDIR)\docview.obj \
+               $(MSWDIR)\dynarray.obj \
+               $(MSWDIR)\dynlib.obj \
+               $(MSWDIR)\effects.obj \
+               $(MSWDIR)\encconv.obj \
+               $(MSWDIR)\event.obj \
+               $(MSWDIR)\extended.obj \
+               $(MSWDIR)\ffile.obj \
+               $(MSWDIR)\file.obj \
+               $(MSWDIR)\fileconf.obj \
+               $(MSWDIR)\filefn.obj \
+               $(MSWDIR)\filename.obj \
+               $(MSWDIR)\filesys.obj \
+               $(MSWDIR)\fontcmn.obj \
+               $(MSWDIR)\fontmap.obj \
+               $(MSWDIR)\framecmn.obj \
+               $(MSWDIR)\fs_inet.obj \
+               $(MSWDIR)\fs_mem.obj \
+               $(MSWDIR)\fs_zip.obj \
+               $(MSWDIR)\gdicmn.obj \
+               $(MSWDIR)\geometry.obj \
+               $(MSWDIR)\gifdecod.obj \
+               $(MSWDIR)\hash.obj \
+               $(MSWDIR)\helpbase.obj \
+               $(MSWDIR)\imagall.obj \
+               $(MSWDIR)\imagbmp.obj \
+               $(MSWDIR)\image.obj \
+               $(MSWDIR)\imaggif.obj \
+               $(MSWDIR)\imagxpm.obj \
+               $(MSWDIR)\intl.obj \
+               $(MSWDIR)\ipcbase.obj \
+               $(MSWDIR)\layout.obj \
+               $(MSWDIR)\lboxcmn.obj \
+               $(MSWDIR)\list.obj \
+               $(MSWDIR)\log.obj \
+               $(MSWDIR)\longlong.obj \
+               $(MSWDIR)\matrix.obj \
+               $(MSWDIR)\memory.obj \
+               $(MSWDIR)\menucmn.obj \
+               $(MSWDIR)\module.obj \
+               $(MSWDIR)\mstream.obj \
+               $(MSWDIR)\object.obj \
+               $(MSWDIR)\objstrm.obj \
+               $(MSWDIR)\paper.obj \
+               $(MSWDIR)\prntbase.obj \
+               $(MSWDIR)\quantize.obj \
+               $(MSWDIR)\resource.obj \
+               $(MSWDIR)\serbase.obj \
+               $(MSWDIR)\sizer.obj \
+               $(MSWDIR)\strconv.obj \
+               $(MSWDIR)\stream.obj \
+               $(MSWDIR)\string.obj \
+               $(MSWDIR)\tbarbase.obj \
+               $(MSWDIR)\textcmn.obj \
+               $(MSWDIR)\textfile.obj \
+               $(MSWDIR)\timercmn.obj \
+               $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\treebase.obj \
+               $(MSWDIR)\txtstrm.obj \
+               $(MSWDIR)\unzip.obj \
+               $(MSWDIR)\utilscmn.obj \
+               $(MSWDIR)\valgen.obj \
+               $(MSWDIR)\validate.obj \
+               $(MSWDIR)\valtext.obj \
+               $(MSWDIR)\variant.obj \
+               $(MSWDIR)\wfstream.obj \
+               $(MSWDIR)\wincmn.obj \
+               $(MSWDIR)\wxchar.obj \
+               $(MSWDIR)\wxexpr.obj \
+               $(MSWDIR)\xpmdecod.obj \
+               $(MSWDIR)\zipstrm.obj \
+               $(MSWDIR)\zstream.obj \
+               ${MSWDIR}\resourc2.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)\dcclient.obj \
+               $(MSWDIR)\dcmemory.obj \
+               $(MSWDIR)\dcprint.obj \
+               $(MSWDIR)\dcscreen.obj \
+               $(MSWDIR)\dde.obj \
+               $(MSWDIR)\dialog.obj \
+               $(MSWDIR)\dialup.obj \
+               $(MSWDIR)\dib.obj \
+               $(MSWDIR)\dibutils.obj \
+               $(MSWDIR)\dir.obj \
+               $(MSWDIR)\dragimag.obj \
+               $(MSWDIR)\filedlg.obj \
+               $(MSWDIR)\font.obj \
+               $(MSWDIR)\fontdlg.obj \
+               $(MSWDIR)\fontenum.obj \
+               $(MSWDIR)\fontutil.obj \
+               $(MSWDIR)\frame.obj \
+               $(MSWDIR)\gaugemsw.obj \
+               $(MSWDIR)\gdiimage.obj \
+               $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\glcanvas.obj \
+               $(MSWDIR)\gsocket.obj \
+               $(MSWDIR)\gsockmsw.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)\printdlg.obj \
+               $(MSWDIR)\printwin.obj \
+               $(MSWDIR)\radiobox.obj \
+               $(MSWDIR)\radiobut.obj \
+               $(MSWDIR)\region.obj \
+               $(MSWDIR)\scrolbar.obj \
+               $(MSWDIR)\settings.obj \
+               $(MSWDIR)\slidrmsw.obj \
+               $(MSWDIR)\snglinst.obj \
+               $(MSWDIR)\spinbutt.obj \
+               $(MSWDIR)\spinctrl.obj \
+               $(MSWDIR)\statbmp.obj \
+               $(MSWDIR)\statbox.obj \
+               $(MSWDIR)\statline.obj \
+               $(MSWDIR)\stattext.obj \
+               $(MSWDIR)\tabctrl.obj \
+               $(MSWDIR)\tbarmsw.obj \
+               $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.obj \
+               $(MSWDIR)\timer.obj \
+               $(MSWDIR)\utils.obj \
+               $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\wave.obj \
+               $(MSWDIR)\window.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
@@ -275,8 +287,11 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P1024 @&&!
-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+       tlib $(LIBTARGET) /P2048 @&&!
++$(COMMONOBJS:.obj =.obj +)\
++$(GENERICOBJS:.obj =.obj +)\
++$(MSWOBJS:.obj =.obj +)\
++$(PERIPH_LIBS:.lib =.lib +)
 !
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 !
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -285,8 +300,8 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
-#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-#<<
+# $(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)\y_tab.c:     $(COMMDIR)\dosyacc.c
         copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
@@ -294,368 +309,436 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-#$(OBJECTS):   $(WXDIR)\include\wx\setup.h
+# $(OBJECTS):  $(WXDIR)\include\wx\setup.h
+
+$(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
+
+$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
 
-$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 
-$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
+$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
 
 
-$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
+$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
 
 
-$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+$(MSWDIR)\button.obj: $(MSWDIR)\button.$(SRCSUFF)
 
 
-$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)
+$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
 
 
-$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)
+$(MSWDIR)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF)
 
 
-$(MSWDIR)\caret.obj:     $(MSWDIR)\caret.$(SRCSUFF)
+$(MSWDIR)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF)
 
 
-$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)
+$(MSWDIR)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF)
 
 
-$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)
+$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
 
 
-$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+$(MSWDIR)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF)
 
 
-$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
 
 
-$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+$(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
 
-$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+$(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
 
-$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
 
 
-$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 
-$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
 
-$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
 
-$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
 
 
-$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
 
 
-$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
 
 
-$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
 
 
-$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
 
-$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
 
 
-$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
 
 
-$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
 
-$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
 
 
-$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
 
-$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
 
-$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 
-$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
 
-$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
 
 
-$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
 
 
-$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
 
 
-$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
 
-$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
 
 
-# $(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
 
-$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
 
-$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
 
-# $(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 
-$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
 
 
-$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 
-$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
 
-$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
 
 
-$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 
-$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 
 
-$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
 
-$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+$(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
 
 
-# $(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+$(MSWDIR)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF)
 
 
-$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+$(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
 
 
-$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+$(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
 
-$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
 
-$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
 
-$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
 
-$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
 
-$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
 
-$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 
-$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
 
-$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 
-$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
 
 
-$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+$(MSWDIR)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF)
 
 
-$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+$(MSWDIR)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF)
 
 
-$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
 
 
-$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
 
 
-$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
 
-$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+$(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
 
 
-$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
 
 
-$(MSWDIR)\statline.obj:     $(MSWDIR)\statline.$(SRCSUFF)
+$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
 
-$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
 
 
-$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
 
 
-$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
 
 
-$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+$(MSWDIR)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF)
 
 
-$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+$(MSWDIR)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF)
 
 
-$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+$(MSWDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF)
 
 
-$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+$(MSWDIR)\tbarmsw.obj: $(MSWDIR)\tbarmsw.$(SRCSUFF)
 
 
-$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
 
-$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(SRCSUFF)
+$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
 
 
-$(MSWDIR)\tooltip.obj:     $(MSWDIR)\tooltip.$(SRCSUFF)
+$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
 
-# $(MSWDIR)\treectrl.obj:     $(MSWDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 
-$(MSWDIR)\utils.obj:     $(MSWDIR)\utils.$(SRCSUFF)
+$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
 
-$(MSWDIR)\utilsexc.obj:        $(MSWDIR)\utilsexc.$(SRCSUFF)
+$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 
-$(MSWDIR)\wave.obj:     $(MSWDIR)\wave.$(SRCSUFF)
+$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 
-$(MSWDIR)\window.obj:     $(MSWDIR)\window.$(SRCSUFF)
 
 
-$(MSWDIR)\droptgt.obj:     $(OLEDIR)\droptgt.$(SRCSUFF)
 
 
-$(MSWDIR)\dropsrc.obj:     $(OLEDIR)\dropsrc.$(SRCSUFF)
+########################################################
+# Common objects (always compiled)
 
 
-$(MSWDIR)\dataobj.obj:     $(OLEDIR)\dataobj.$(SRCSUFF)
+$(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
 
-$(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
+$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 
-$(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
+$(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
 
 
-$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
 
 
-########################################################
-# Common objects (always compiled)
+$(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF)
+
+$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
+
+$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
+
+$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+
+$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
+
+$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
+
+$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
+
+$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
+
+$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
+
+$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
+$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
+
+$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
+
+$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
+
+$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
+
+$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
+
+$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
+
+$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
+
+$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
 
 
-$(MSWDIR)\config.obj:     $(COMMDIR)\config.$(SRCSUFF)
+$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
 
 
-$(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
+$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
 
-$(MSWDIR)\dcbase.obj:     $(COMMDIR)\dcbase.$(SRCSUFF)
+$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
 
-$(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
 
-$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 
 
-$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+$(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
 
 
-$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
 
-$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+$(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
 
 
-$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
 
-$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+$(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
 
-$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+$(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
 
 
-$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+$(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
 
-$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+$(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
 
-$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+$(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
 
 
-$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 
-$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 
-$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
 
 
-$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+$(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 
-$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
 
-$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 
-$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+$(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
 
 
-$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
 
-$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
 
-$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
 
-$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
 
 
-$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 
-$(MSWDIR)\resourc2.obj:     $(COMMDIR)\resourc2.$(SRCSUFF)
+$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 
 
-$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+$(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
 
 
-$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+$(MSWDIR)\lboxcmn.obj: $(COMMDIR)\lboxcmn.$(SRCSUFF)
 
 
-$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+$(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
 
-$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+$(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
 
-$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
 
 
-$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+$(MSWDIR)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF)
 
 
-$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
 
-$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+$(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
 
 
-$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
 
-$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 
-$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
 
 
-$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
+$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
 
 
-$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
 
-$(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
+$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 
-$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
 
 
-$(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
+$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
 
-$(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
+$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
 
 
-$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
+$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 
-$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
+$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
 
-$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
+$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 
-$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
+$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
 
-$(MSWDIR)\wfstream.obj:        $(COMMDIR)\wfstream.$(SRCSUFF)
+$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
 
-$(MSWDIR)\stream.obj:  $(COMMDIR)\stream.$(SRCSUFF)
+$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 
-$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
+$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
 
-$(MSWDIR)\dlgcmn.obj:  $(COMMDIR)\dlgcmn.$(SRCSUFF)
+$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 
-$(MSWDIR)\wincmn.obj:  $(COMMDIR)\wincmn.$(SRCSUFF)
+$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
 
-$(MSWDIR)\extended.obj:        $(COMMDIR)\extended.c
+$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
 
 
-$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
+$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 
-$(MSWDIR)\socket.obj:  $(COMMDIR)\socket.$(SRCSUFF)
+$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
 
 
-$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
+$(MSWDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF)
 
 
-$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+$(MSWDIR)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF)
 
 
-$(MSWDIR)\url.obj:     $(COMMDIR)\url.$(SRCSUFF)
+$(MSWDIR)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF)
 
 
-$(MSWDIR)\http.obj:    $(COMMDIR)\http.$(SRCSUFF)
+$(MSWDIR)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF)
 
 
-$(MSWDIR)\ftp.obj:     $(COMMDIR)\ftp.$(SRCSUFF)
+$(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF)
 
 
-$(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
+$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF)
+
+$(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
+
+$(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
+
+$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
+
+$(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
+
+$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
+
+$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
+
+${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(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)
 
 
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
-$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
+
+$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+
+$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+
+$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+
+$(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
+
+$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
 
 
-$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
 
-$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 
 
-$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 
-$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+$(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
 
-$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
 
 
-$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+$(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
 
-$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 
-$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
 
-$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
 
 
-$(MSWDIR)\progdlgg.obj:     $(GENDIR)\progdlgg.$(SRCSUFF)
+$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
 
-$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
 
 
-$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
 
 
-$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
 
 
-$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 
-$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
 
-$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
 
 
-$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
+$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 
-$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
+$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
 
-$(MSWDIR)\tipdlg.obj:     $(GENDIR)\tipdlg.$(SRCSUFF)
+$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
 
-$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(SRCSUFF)
+$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
 
 
-$(MSWDIR)\treectrl.obj:     $(GENDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
 
-$(MSWDIR)\listctrl.obj:     $(GENDIR)\listctrl.$(SRCSUFF)
+$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
+
+$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
+
+$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+
+$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
+
+$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
-$(MSWDIR)\imaglist.obj:     $(GENDIR)\imaglist.$(SRCSUFF)
 
 
-$(MSWDIR)\notebook.obj:     $(GENDIR)\notebook.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
 
 all_utils:
     cd $(WXDIR)\utils
@@ -672,29 +755,10 @@ all_execs:
     make -f makefile.bcc all_execs
     cd $(WXDIR)\src\msw
 
     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
 # 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
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.bcc 
+        make -f makefile.bcc
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -729,7 +793,7 @@ $(CFG): makefile.bcc
 -Fs-
 -Vf
 -Ff=4
 -Fs-
 -Vf
 -Ff=4
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__
@@ -761,3 +825,11 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
 cleanall: clean
 
 
+MFTYPE=bcc
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\msw
wxWidgets (Impactor)