]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.bcc
fixes in cleanup of DDE servers: don't delete them ourseleves (this is inconsistent...
[wxWidgets.git] / src / msw / makefile.bcc
index c3b720ebdd6eedffe2178f6b6d1b931fad1cf667..25f951f9891af9201c085122e19d7dc3f0ade28e 100644 (file)
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:55, 2000/03/14
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -8,7 +8,7 @@
 # Author:   Julian Smart
 # Created:  1993
 # Updated:
-# Copyright:(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
 # "%W% %G%"
 #
@@ -40,7 +40,6 @@ THISDIR = $(WXDIR)\src\msw
 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=1
-USE_XPM_IN_MSW=1
 
 PERIPH_LIBS=
 PERIPH_TARGET=
@@ -50,12 +49,6 @@ PERIPH_CLEAN_TARGET=
 PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !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
-
 # TODO: add these libraries
 # PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
 PERIPH_TARGET=zlib png $(PERIPH_TARGET)
@@ -76,79 +69,105 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcbuffer.obj \
+               $(MSWDIR)\dcpsg.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)\mdig.obj \
                $(MSWDIR)\notebook.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
-               $(MSWDIR)\plot.obj \
+               $(MSWDIR)\prntdlgg.obj \
                $(MSWDIR)\progdlgg.obj \
-               $(MSWDIR)\prop.obj \
-               $(MSWDIR)\propform.obj \
-               $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
-               $(MSWDIR)\scrolwin.obj \
+               $(MSWDIR)\scrlwing.obj \
+               $(MSWDIR)\selstore.obj \
+               $(MSWDIR)\spinctlg.obj \
+               $(MSWDIR)\splash.obj \
                $(MSWDIR)\splitter.obj \
                $(MSWDIR)\statusbr.obj \
                $(MSWDIR)\tabg.obj \
                $(MSWDIR)\tbarsmpl.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \
-               $(MSWDIR)\treectrl.obj \
-               $(MSWDIR)\treelay.obj \
+               $(MSWDIR)\tipwin.obj \
+               $(MSWDIR)\treectlg.obj \
                $(MSWDIR)\wizard.obj
 
 COMMONOBJS = \
-               $(MSWDIR)\y_tab.obj \
+               $(MSWDIR)\accesscmn.obj \
+               $(MSWDIR)\appbase.obj \
                $(MSWDIR)\appcmn.obj \
+               $(MSWDIR)\artprov.obj \
+               $(MSWDIR)\artstd.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)\datacmn.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
-               $(MSWDIR)\db.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)\dpycmn.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)\fldlgcmn.obj \
+               $(MSWDIR)\fmapbase.obj \
                $(MSWDIR)\fontcmn.obj \
                $(MSWDIR)\fontmap.obj \
                $(MSWDIR)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
                $(MSWDIR)\fs_mem.obj \
                $(MSWDIR)\fs_zip.obj \
+               $(MSWDIR)\gaugecmn.obj \
                $(MSWDIR)\gdicmn.obj \
                $(MSWDIR)\geometry.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
+               $(MSWDIR)\hashmap.obj \
                $(MSWDIR)\helpbase.obj \
+               $(MSWDIR)\iconbndl.obj \
                $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
+               $(MSWDIR)\imagfill.obj \
                $(MSWDIR)\imaggif.obj \
+               $(MSWDIR)\imagiff.obj \
+               $(MSWDIR)\imagxpm.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
@@ -156,25 +175,38 @@ COMMONOBJS = \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\longlong.obj \
+               $(MSWDIR)\matrix.obj \
                $(MSWDIR)\memory.obj \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\module.obj \
+               $(MSWDIR)\msgout.obj \
                $(MSWDIR)\mstream.obj \
+               $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
-               $(MSWDIR)\objstrm.obj \
                $(MSWDIR)\paper.obj \
+               $(MSWDIR)\popupcmn.obj \
                $(MSWDIR)\prntbase.obj \
-               $(MSWDIR)\resource.obj \
-               $(MSWDIR)\serbase.obj \
+               $(MSWDIR)\quantize.obj \
+               $(MSWDIR)\radiocmn.obj \
+               $(MSWDIR)\regex.obj \
+               $(MSWDIR)\rgncmn.obj \
+               $(MSWDIR)\settcmn.obj \
                $(MSWDIR)\sizer.obj \
+               $(MSWDIR)\statbar.obj \
+               $(MSWDIR)\stopwatch.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
+               $(MSWDIR)\sysopt.obj \
+               $(MSWDIR)\taskbarcmn.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 \
                $(MSWDIR)\utilscmn.obj \
@@ -185,13 +217,14 @@ COMMONOBJS = \
                $(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)\basemsw.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -205,7 +238,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\colour.obj \
                $(MSWDIR)\combobox.obj \
                $(MSWDIR)\control.obj \
-               $(MSWDIR)\curico.obj \
                $(MSWDIR)\cursor.obj \
                $(MSWDIR)\data.obj \
                $(MSWDIR)\dc.obj \
@@ -217,16 +249,15 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dialog.obj \
                $(MSWDIR)\dialup.obj \
                $(MSWDIR)\dib.obj \
-               $(MSWDIR)\dibutils.obj \
                $(MSWDIR)\dir.obj \
                $(MSWDIR)\dragimag.obj \
+               $(MSWDIR)\evtloop.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 \
@@ -244,11 +275,13 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\metafile.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
+               $(MSWDIR)\mslu.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
+               $(MSWDIR)\popupwin.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
@@ -257,6 +290,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slidrmsw.obj \
+               $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
@@ -266,12 +300,16 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tabctrl.obj \
                $(MSWDIR)\tbarmsw.obj \
                $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\timer.obj \
+               $(MSWDIR)\toplevel.obj \
                $(MSWDIR)\utils.obj \
                $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\utilsgui.obj \
+               $(MSWDIR)\uxtheme.obj \
+               $(MSWDIR)\volume.obj \
                $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
@@ -291,24 +329,14 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 
-$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-
-#        cl @<<
-# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-# <<
-
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-
 # $(OBJECTS):  $(WXDIR)\include\wx\setup.h
 
 $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
+$(MSWDIR)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF)
+
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
@@ -335,8 +363,6 @@ $(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
 $(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
-
 $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
@@ -359,12 +385,12 @@ $(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
 
 $(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
-
 $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
 $(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
+$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
+
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
@@ -377,8 +403,6 @@ $(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
 
 $(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
-$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
-
 $(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
@@ -413,6 +437,8 @@ $(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)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
@@ -423,6 +449,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
@@ -439,6 +467,8 @@ $(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
 $(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
 
+$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+
 $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
 $(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF)
@@ -457,49 +487,73 @@ $(MSWDIR)\tbarmsw.obj: $(MSWDIR)\tbarmsw.$(SRCSUFF)
 
 $(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
+$(MSWDIR)\tglbtn.obj: $(MSWDIR)\tglbtn.$(SRCSUFF)
+
 $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
+$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+
 $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
+$(MSWDIR)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF)
+
+$(MSWDIR)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF)
+
+$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
-
 
 
 ########################################################
 # Common objects (always compiled)
 
+$(MSWDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
+
+$(MSWDIR)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF)
+
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
+$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
+
+$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF)
+
 $(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)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
+$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
+
 $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
-$(MSWDIR)\db.obj: $(COMMDIR)\db.$(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)
@@ -510,16 +564,26 @@ $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
+$(MSWDIR)\dpycmn.obj: $(COMMDIR)\dpycmn.$(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)
 
 $(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)
@@ -528,8 +592,14 @@ $(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)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF)
+
+$(MSWDIR)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF)
+
 $(MSWDIR)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
 $(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
@@ -542,6 +612,8 @@ $(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
 
 $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
+$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
+
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 $(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
@@ -550,16 +622,26 @@ $(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)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF)
+
 $(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF)
 
 $(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
 $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
+$(MSWDIR)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF)
+
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
+$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
+
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -574,36 +656,58 @@ $(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)
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
+$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(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)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
+$(MSWDIR)\popupcmn.obj: $(COMMDIR)\popupcmn.$(SRCSUFF)
+
 $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
-$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+
+$(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF)
+
+$(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
+
+$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
 
-$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
 
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
+$(MSWDIR)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
+
+$(MSWDIR)\stopwatch.obj: $(COMMDIR)\stopwatch.$(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)\taskbarcmn.obj: $(COMMDIR)\taskbarcmn.$(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)
@@ -612,6 +716,10 @@ $(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
@@ -632,7 +740,7 @@ $(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)
 
@@ -652,12 +760,20 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(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)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
@@ -668,25 +784,27 @@ $(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
 $(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
 
+$(MSWDIR)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF)
+
 $(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
 $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF)
+$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
 
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
+$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
-$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
+$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
 
-$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
+$(MSWDIR)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF)
 
-$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
+$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
 
-$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
@@ -700,12 +818,14 @@ $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
 $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
-$(MSWDIR)\treectrl.obj: $(GENDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
 
-$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
+$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
+
+
 all_utils:
     cd $(WXDIR)\utils
     make -f makefile.bcc
@@ -722,11 +842,6 @@ all_execs:
     cd $(WXDIR)\src\msw
 
 # CONTRIB
-xpm:   $(CFG)
-       cd $(WXDIR)\src\xpm
-       make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
-       cd $(WXDIR)\src\msw
-
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.bcc
@@ -764,7 +879,7 @@ $(CFG): makefile.bcc
 -Fs-
 -Vf
 -Ff=4
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(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__
@@ -790,8 +905,6 @@ clean: $(PERIPH_CLEAN_TARGET)
     erase *.pch
     erase *.csm
     erase *.cfg
-       erase ..\common\y_tab.c
-    erase ..\common\lex_yy.c
 
 cleanall: clean