]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.b32
implemented menu drawing in the GTK theme
[wxWidgets.git] / src / msw / makefile.b32
index 629d11bc936145f4e5638ce045139d17cd031616..9aa4f72a75863aa37906bafb8a32ea3ec699a1d4 100644 (file)
@@ -1,6 +1,6 @@
 
 
 
 
-# This file was automatically generated by tmake at 19:00, 1999/12/14
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -37,7 +37,6 @@ WXBUILDDLL=1
 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=0
 # 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_LIBS=
 PERIPH_TARGET=
@@ -50,22 +49,16 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
 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=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
 PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
 !else
 DUMMY=dummydll
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32 import32 ole2w32
+LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
 !endif
 
 LIBTARGET=$(WXLIB)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -79,8 +72,14 @@ MSWDIR=.
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
+               $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcpsg.obj \
+               $(MSWDIR)\dirctrlg.obj \
+               $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
+               $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
@@ -90,18 +89,22 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\propform.obj \
                $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
                $(MSWDIR)\propform.obj \
                $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
-               $(MSWDIR)\scrolwin.obj \
+               $(MSWDIR)\scrlwing.obj \
+               $(MSWDIR)\spinctlg.obj \
+               $(MSWDIR)\splash.obj \
                $(MSWDIR)\splitter.obj \
                $(MSWDIR)\statusbr.obj \
                $(MSWDIR)\tbarsmpl.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \
                $(MSWDIR)\splitter.obj \
                $(MSWDIR)\statusbr.obj \
                $(MSWDIR)\tbarsmpl.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \
+               $(MSWDIR)\tipwin.obj \
+               $(MSWDIR)\treectlg.obj \
+               $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
 # Not needed:
 #  $(MSWDIR)\colrdlgg.obj \
 #  $(MSWDIR)\fontdlgg.obj \
                $(MSWDIR)\wizard.obj
 
 # Not needed:
 #  $(MSWDIR)\colrdlgg.obj \
 #  $(MSWDIR)\fontdlgg.obj \
-#  $(MSWDIR)\helpxlp.obj \
 #  $(MSWDIR)\msgdlgg.obj \
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
 #  $(MSWDIR)\msgdlgg.obj \
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
@@ -114,49 +117,68 @@ COMMONOBJS = \
                $(MSWDIR)\appcmn.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
                $(MSWDIR)\appcmn.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
+               $(MSWDIR)\clntdata.obj \
+               $(MSWDIR)\cmdline.obj \
+               $(MSWDIR)\cmdproc.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
+               $(MSWDIR)\containr.obj \
+               $(MSWDIR)\cshelp.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
-               $(MSWDIR)\date.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
+               $(MSWDIR)\dbgrid.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
+               $(MSWDIR)\dircmn.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dlgcmn.obj \
+               $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
+               $(MSWDIR)\dseldlg.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
+               $(MSWDIR)\dynload.obj \
+               $(MSWDIR)\effects.obj \
+               $(MSWDIR)\encconv.obj \
                $(MSWDIR)\event.obj \
                $(MSWDIR)\extended.obj \
                $(MSWDIR)\event.obj \
                $(MSWDIR)\extended.obj \
+               $(MSWDIR)\fddlgcmn.obj \
                $(MSWDIR)\ffile.obj \
                $(MSWDIR)\file.obj \
                $(MSWDIR)\fileconf.obj \
                $(MSWDIR)\filefn.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)\filesys.obj \
                $(MSWDIR)\fontcmn.obj \
                $(MSWDIR)\fontmap.obj \
                $(MSWDIR)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
+               $(MSWDIR)\fs_mem.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\ftp.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\ftp.obj \
+               $(MSWDIR)\gaugecmn.obj \
                $(MSWDIR)\gdicmn.obj \
                $(MSWDIR)\gdicmn.obj \
+               $(MSWDIR)\geometry.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
+               $(MSWDIR)\hashmap.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\http.obj \
                $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\http.obj \
                $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.obj \
+               $(MSWDIR)\imagiff.obj \
                $(MSWDIR)\imagjpeg.obj \
                $(MSWDIR)\imagpcx.obj \
                $(MSWDIR)\imagpng.obj \
                $(MSWDIR)\imagpnm.obj \
                $(MSWDIR)\imagtiff.obj \
                $(MSWDIR)\imagjpeg.obj \
                $(MSWDIR)\imagpcx.obj \
                $(MSWDIR)\imagpng.obj \
                $(MSWDIR)\imagpnm.obj \
                $(MSWDIR)\imagtiff.obj \
+               $(MSWDIR)\imagxpm.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
@@ -164,35 +186,43 @@ COMMONOBJS = \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\longlong.obj \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\longlong.obj \
+               $(MSWDIR)\matrix.obj \
                $(MSWDIR)\memory.obj \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\memory.obj \
                $(MSWDIR)\menucmn.obj \
-               $(MSWDIR)\mimetype.obj \
+               $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
+               $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
                $(MSWDIR)\object.obj \
-               $(MSWDIR)\objstrm.obj \
                $(MSWDIR)\odbc.obj \
                $(MSWDIR)\paper.obj \
                $(MSWDIR)\odbc.obj \
                $(MSWDIR)\paper.obj \
+               $(MSWDIR)\popupcmn.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\process.obj \
                $(MSWDIR)\protocol.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\process.obj \
                $(MSWDIR)\protocol.obj \
+               $(MSWDIR)\quantize.obj \
+               $(MSWDIR)\radiocmn.obj \
+               $(MSWDIR)\regex.obj \
                $(MSWDIR)\resource.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
                $(MSWDIR)\resource.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
-               $(MSWDIR)\serbase.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
+               $(MSWDIR)\statbar.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
+               $(MSWDIR)\sysopt.obj \
                $(MSWDIR)\tbarbase.obj \
                $(MSWDIR)\tbarbase.obj \
+               $(MSWDIR)\textbuf.obj \
                $(MSWDIR)\textcmn.obj \
                $(MSWDIR)\textfile.obj \
                $(MSWDIR)\textcmn.obj \
                $(MSWDIR)\textfile.obj \
-               $(MSWDIR)\time.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\toplvcmn.obj \
+               $(MSWDIR)\treebase.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\url.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\url.obj \
@@ -205,11 +235,13 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
+               $(MSWDIR)\xpmdecod.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
+               $(MSWDIR)\automtn.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -242,6 +274,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\dropsrc.obj \
                $(MSWDIR)\droptgt.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\dropsrc.obj \
                $(MSWDIR)\droptgt.obj \
+               $(MSWDIR)\enhmeta.obj \
+               $(MSWDIR)\evtloop.obj \
+               $(MSWDIR)\fdrepdlg.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -251,7 +286,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\gauge95.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
                $(MSWDIR)\gauge95.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\glcanvas.obj \
                $(MSWDIR)\gsocket.obj \
                $(MSWDIR)\gsocket.obj \
+               $(MSWDIR)\gsockmsw.obj \
+               $(MSWDIR)\helpbest.obj \
+               $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
@@ -263,8 +302,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\menuitem.obj \
                $(MSWDIR)\metafile.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\menuitem.obj \
                $(MSWDIR)\metafile.obj \
+               $(MSWDIR)\mimetype.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
+               $(MSWDIR)\mslu.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\notebook.obj \
                $(MSWDIR)\oleutils.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\notebook.obj \
                $(MSWDIR)\oleutils.obj \
@@ -282,6 +323,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
+               $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
@@ -293,16 +335,18 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
                $(MSWDIR)\textctrl.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
                $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
                $(MSWDIR)\timer.obj \
                $(MSWDIR)\tooltip.obj \
                $(MSWDIR)\thread.obj \
                $(MSWDIR)\timer.obj \
                $(MSWDIR)\tooltip.obj \
+               $(MSWDIR)\toplevel.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\uuid.obj \
                $(MSWDIR)\treectrl.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
                $(MSWDIR)\uuid.obj \
+               $(MSWDIR)\volume.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\helpdata.obj \
 
 HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\helpdata.obj \
@@ -313,13 +357,16 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\htmltag.obj \
                $(MSWDIR)\htmlwin.obj \
                $(MSWDIR)\htmprint.obj \
                $(MSWDIR)\htmltag.obj \
                $(MSWDIR)\htmlwin.obj \
                $(MSWDIR)\htmprint.obj \
+               $(MSWDIR)\m_dflist.obj \
                $(MSWDIR)\m_fonts.obj \
                $(MSWDIR)\m_hline.obj \
                $(MSWDIR)\m_image.obj \
                $(MSWDIR)\m_layout.obj \
                $(MSWDIR)\m_links.obj \
                $(MSWDIR)\m_list.obj \
                $(MSWDIR)\m_fonts.obj \
                $(MSWDIR)\m_hline.obj \
                $(MSWDIR)\m_image.obj \
                $(MSWDIR)\m_layout.obj \
                $(MSWDIR)\m_links.obj \
                $(MSWDIR)\m_list.obj \
+               $(MSWDIR)\m_meta.obj \
                $(MSWDIR)\m_pre.obj \
                $(MSWDIR)\m_pre.obj \
+               $(MSWDIR)\m_style.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
 
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
 
@@ -327,15 +374,21 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:       wx
 
 
 default:       wx
 
-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+# TODO: put the setup.h under lib
+setuph:
+     cd $(WXDIR)\include\wx\msw
+     if not exist setup.h copy setup0.h setup.h
+     cd $(WXDIR)\src\msw
 
 
-all:   all_libs all_execs
+all:   wx
 
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
 
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib "$(LIBTARGET)" /P1024 @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
@@ -344,19 +397,21 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        -erase $(LIBTARGET)
        -erase $(WXLIBDIR)\wx.dll
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        -erase $(LIBTARGET)
        -erase $(WXLIBDIR)\wx.dll
-        tlink32 $(LINK_FLAGS) /v @&&!
+        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
+       -erase $(WXLIBDIR)\version.res
+        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
 
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
         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
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
@@ -376,6 +431,8 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
@@ -440,6 +497,12 @@ $(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
 $(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
 
 $(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
+$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
+
+$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
+
+$(MSWDIR)\fdrepdlg.obj: $(MSWDIR)\fdrepdlg.$(SRCSUFF)
+
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
@@ -458,8 +521,16 @@ $(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
+$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
+
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
+$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
+
+$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
+
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
@@ -482,10 +553,14 @@ $(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
 
 $(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
 
 $(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
+$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
+
 $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
 $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
 $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
 $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
+$(MSWDIR)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF)
+
 $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
 $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
 $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
 $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
@@ -520,6 +595,8 @@ $(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
 $(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
 
 
 $(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
 
+$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+
 $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
 $(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
 $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
 $(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
@@ -542,12 +619,16 @@ $(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF)
 
 $(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
 
 $(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
+$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
+
 $(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
 $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
 $(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
 $(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
 $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
 $(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
+$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+
 $(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
 
 $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 $(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
 
 $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
@@ -556,12 +637,12 @@ $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
 $(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
 
 $(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
+$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
-
 
 
 ########################################################
 
 
 ########################################################
@@ -573,42 +654,66 @@ $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
 
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
 
+$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF)
+
+$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
+
+$(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF)
+
 $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
 $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
+$(MSWDIR)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF)
+
+$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
-$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
-
 $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
 $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
 $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
 $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
+$(MSWDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF)
+
 $(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
 $(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
+$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(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)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
 
 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
+$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
+
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
+$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
+
+$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
+
+$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
+
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
 $(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
 $(MSWDIR)\extended.obj: $(COMMDIR)\extended.c
 
+$(MSWDIR)\fddlgcmn.obj: $(COMMDIR)\fddlgcmn.$(SRCSUFF)
+
 $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
 $(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 $(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
 
 $(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
@@ -617,6 +722,8 @@ $(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
 
 $(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
 
 $(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
+$(MSWDIR)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
+
 $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
 $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 $(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
 $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
@@ -627,16 +734,24 @@ $(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
 $(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
 
 $(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
+$(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
+
 $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
 
 $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
 
+$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
+
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
+$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
+
 $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
 $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
+$(MSWDIR)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF)
+
 $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
 $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
@@ -649,6 +764,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
 
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
+$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
+
 $(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
 $(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
 $(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
 $(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
@@ -659,6 +776,8 @@ $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
 
 $(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
 
 
 $(MSWDIR)\imagtiff.obj: $(COMMDIR)\imagtiff.$(SRCSUFF)
 
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -673,30 +792,40 @@ $(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
 $(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
 
 
 $(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF)
 
+$(MSWDIR)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF)
+
 $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
 $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
 
 $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
 $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
 
-$(MSWDIR)\mimetype.obj: $(COMMDIR)\mimetype.$(SRCSUFF)
+$(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
-$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
+$(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
 
 
-$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
 
 $(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF)
 
 $(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
 
 $(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF)
 
 $(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
+$(MSWDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
+
 $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
 $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+
+$(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF)
+
+$(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
+
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
@@ -707,30 +836,36 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
-$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
-
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
+$(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
+
 $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
 $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
+$(MSWDIR)\sysopt.obj: $(COMMDIR)\sysopt.$(SRCSUFF)
+
 $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
 $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
+$(MSWDIR)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF)
+
 $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
 $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
-$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
-
 $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
 $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
+$(MSWDIR)\toplvcmn.obj: $(COMMDIR)\toplvcmn.$(SRCSUFF)
+
+$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
+
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 $(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 $(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
@@ -755,6 +890,8 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(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)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
@@ -767,10 +904,22 @@ $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
 
 $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
+$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+
+$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+
+$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+
 $(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
 $(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 $(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 $(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
@@ -789,7 +938,11 @@ $(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)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
+
+$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
+
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
@@ -801,6 +954,12 @@ $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
 $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(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)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
@@ -826,6 +985,8 @@ $(MSWDIR)\htmlwin.obj: $(HTMLDIR)\htmlwin.$(SRCSUFF)
 
 $(MSWDIR)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF)
 
 
 $(MSWDIR)\htmprint.obj: $(HTMLDIR)\htmprint.$(SRCSUFF)
 
+$(MSWDIR)\m_dflist.obj: $(HTMLDIR)\m_dflist.$(SRCSUFF)
+
 $(MSWDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF)
 
 $(MSWDIR)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF)
 $(MSWDIR)\m_fonts.obj: $(HTMLDIR)\m_fonts.$(SRCSUFF)
 
 $(MSWDIR)\m_hline.obj: $(HTMLDIR)\m_hline.$(SRCSUFF)
@@ -838,8 +999,12 @@ $(MSWDIR)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF)
 
 $(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
 
 
 $(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
 
+$(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF)
+
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
+$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
+
 $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 
 $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 
 $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
@@ -862,16 +1027,6 @@ all_execs:
     make -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
     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
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.b32
@@ -902,23 +1057,44 @@ clean_jpeg:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
+regex:   $(CFG)
+        cd $(WXDIR)\src\regex
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_regex:
+        cd $(WXDIR)\src\regex
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+tiff:   $(CFG)
+        cd $(WXDIR)\src\tiff
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_tiff:
+        cd $(WXDIR)\src\tiff
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
 $(CFG): makefile.b32
        copy &&!
 $(CFG): makefile.b32
        copy &&!
+-Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
+-a1 # byte alignment
 -R-
 -X
 -w-par
 -w-aus
 -w-hid # virtual function A hides virtual function B
 -R-
 -X
 -w-par
 -w-aus
 -w-hid # virtual function A hides virtual function B
--WE
 -tWM
 
 -tWM
 
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
@@ -928,11 +1104,11 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
 $(WIN95FLAG)
 ! $(CFG)
 
-#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
-# -Oxt
-
 clean: $(PERIPH_CLEAN_TARGET)
     -erase $(LIBTARGET)
 clean: $(PERIPH_CLEAN_TARGET)
     -erase $(LIBTARGET)
+    -erase $(WXLIBDIR)\wx.dll
+    -erase $(WXLIBDIR)\wx.tds
+    -erase $(WXLIBDIR)\wx.il?
     -erase *.obj
     -erase *.pch
     -erase *.csm
     -erase *.obj
     -erase *.pch
     -erase *.csm