]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.b32
some really ancient tips updated, mention make problems and flex version minimal...
[wxWidgets.git] / src / msw / makefile.b32
index 3e2c329a811c3f6bd46f61faceeb5cd8c22da0f6..46d97d18617d416ec8fbbb379e906f71d3a1eecc 100644 (file)
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:13, 2000/09/12
+# This file was automatically generated by tmake at 22:26, 2002/01/29
 # 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
-USE_XPM_IN_MSW=1
 
 PERIPH_LIBS=
 PERIPH_TARGET=
@@ -50,22 +49,16 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\lib\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 $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(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
-LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
+LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -81,21 +74,23 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
                $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
-               $(MSWDIR)\plot.obj \
                $(MSWDIR)\progdlgg.obj \
                $(MSWDIR)\prop.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 \
@@ -110,7 +105,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 # Not needed:
 #  $(MSWDIR)\colrdlgg.obj \
 #  $(MSWDIR)\fontdlgg.obj \
-#  $(MSWDIR)\helpxlp.obj \
 #  $(MSWDIR)\msgdlgg.obj \
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
@@ -123,32 +117,41 @@ COMMONOBJS = \
                $(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)\containr.obj \
                $(MSWDIR)\cshelp.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
+               $(MSWDIR)\dbgrid.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
+               $(MSWDIR)\dircmn.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
+               $(MSWDIR)\dseldlg.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
+               $(MSWDIR)\dynload.obj \
                $(MSWDIR)\effects.obj \
                $(MSWDIR)\encconv.obj \
                $(MSWDIR)\event.obj \
                $(MSWDIR)\extended.obj \
+               $(MSWDIR)\fddlgcmn.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 \
@@ -157,21 +160,25 @@ COMMONOBJS = \
                $(MSWDIR)\fs_mem.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\ftp.obj \
+               $(MSWDIR)\gaugecmn.obj \
                $(MSWDIR)\gdicmn.obj \
                $(MSWDIR)\geometry.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)\imagiff.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 \
@@ -179,35 +186,42 @@ COMMONOBJS = \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\longlong.obj \
+               $(MSWDIR)\matrix.obj \
                $(MSWDIR)\memory.obj \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
+               $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
-               $(MSWDIR)\objstrm.obj \
                $(MSWDIR)\odbc.obj \
                $(MSWDIR)\paper.obj \
+               $(MSWDIR)\popupcmn.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)\serbase.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
+               $(MSWDIR)\statbar.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
+               $(MSWDIR)\sysopt.obj \
                $(MSWDIR)\tbarbase.obj \
+               $(MSWDIR)\textbuf.obj \
                $(MSWDIR)\textcmn.obj \
                $(MSWDIR)\textfile.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\toplvcmn.obj \
                $(MSWDIR)\treebase.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
@@ -221,6 +235,7 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
+               $(MSWDIR)\xpmdecod.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj
 
@@ -260,6 +275,8 @@ MSWOBJS = $(MSWDIR)\accel.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 \
@@ -272,6 +289,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\glcanvas.obj \
                $(MSWDIR)\gsocket.obj \
                $(MSWDIR)\gsockmsw.obj \
+               $(MSWDIR)\helpbest.obj \
                $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
@@ -304,6 +322,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
+               $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
@@ -315,16 +334,17 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
                $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.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)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\helpdata.obj \
@@ -344,6 +364,7 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\m_list.obj \
                $(MSWDIR)\m_meta.obj \
                $(MSWDIR)\m_pre.obj \
+               $(MSWDIR)\m_style.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
 
@@ -353,13 +374,13 @@ default:  wx
 
 wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
-all:   all_libs all_execs
+all:   wx
 
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib "$(LIBTARGET)" /P1024 @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
@@ -375,12 +396,14 @@ 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
-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
 
@@ -468,6 +491,10 @@ $(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)
@@ -492,6 +519,8 @@ $(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)
@@ -556,6 +585,8 @@ $(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(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)
@@ -578,12 +609,16 @@ $(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(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)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+
 $(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
 
 $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
@@ -596,8 +631,6 @@ $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
-
 
 
 ########################################################
@@ -609,12 +642,18 @@ $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(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)\containr.obj: $(COMMDIR)\containr.$(SRCSUFF)
+
 $(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
 
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
@@ -627,10 +666,14 @@ $(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)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
 $(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
@@ -641,10 +684,14 @@ $(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)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
+
 $(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
 
 $(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
@@ -653,6 +700,8 @@ $(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)
@@ -661,6 +710,8 @@ $(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(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)
@@ -677,6 +728,8 @@ $(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)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
@@ -685,6 +738,8 @@ $(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)
@@ -697,6 +752,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(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)
@@ -707,6 +764,8 @@ $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(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)
@@ -721,6 +780,8 @@ $(MSWDIR)\log.obj: $(COMMDIR)\log.$(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)
@@ -731,14 +792,16 @@ $(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)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
+
 $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
@@ -747,6 +810,10 @@ $(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)
@@ -757,20 +824,24 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(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)\statbar.obj: $(COMMDIR)\statbar.$(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)\textbuf.obj: $(COMMDIR)\textbuf.$(SRCSUFF)
+
 $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
@@ -779,6 +850,8 @@ $(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)
@@ -805,6 +878,8 @@ $(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)
@@ -821,12 +896,16 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(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)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
 $(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
@@ -837,8 +916,6 @@ $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF)
-
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
 $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
@@ -849,7 +926,9 @@ $(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(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)
 
@@ -912,6 +991,8 @@ $(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(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)
@@ -934,16 +1015,6 @@ all_execs:
     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
@@ -974,13 +1045,13 @@ clean_jpeg:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
-xpm:    $(CFG)
-        cd $(WXDIR)\src\xpm
+regex:   $(CFG)
+        cd $(WXDIR)\src\regex
         make -f makefile.b32 lib
         cd $(WXDIR)\src\msw
 
-clean_xpm:
-        cd $(WXDIR)\src\xpm
+clean_regex:
+        cd $(WXDIR)\src\regex
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
@@ -1009,7 +1080,7 @@ $(CFG): makefile.b32
 -WE
 -tWM
 
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
+-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
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk