]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.bcc
fixed clip rect when logical coords != device ones
[wxWidgets.git] / src / msw / makefile.bcc
index 67c9152640f44f16de225a6480b2225f0d9392bc..bcff224380262139043a0bab693fa6b8fca554e0 100644 (file)
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:33, 1999/10/23
+# This file was automatically generated by tmake at 01:55, 2001/06/09
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -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=0
 
 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)\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)
@@ -74,9 +67,14 @@ MSWDIR=.
 DOCDIR = $(WXDIR)\docs
 
 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 \
@@ -84,18 +82,23 @@ GENERICOBJS= $(MSWDIR)\busyinfo.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)\treectrl.obj \
+               $(MSWDIR)\tipwin.obj \
+               $(MSWDIR)\treectlg.obj \
+               $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
 COMMONOBJS = \
@@ -103,33 +106,41 @@ COMMONOBJS = \
                $(MSWDIR)\appcmn.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
+               $(MSWDIR)\cmdline.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
+               $(MSWDIR)\cshelp.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
-               $(MSWDIR)\date.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)\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 \
@@ -137,19 +148,24 @@ COMMONOBJS = \
                $(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 \
@@ -157,12 +173,11 @@ COMMONOBJS = \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
                $(MSWDIR)\tbarbase.obj \
-               $(MSWDIR)\tbarsmpl.obj \
                $(MSWDIR)\textcmn.obj \
                $(MSWDIR)\textfile.obj \
-               $(MSWDIR)\time.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\treebase.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\utilscmn.obj \
@@ -174,9 +189,10 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
+               $(MSWDIR)\xpmdecod.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj \
-               ${MSWDIR}\resourc2.cpp
+               ${MSWDIR}\resourc2.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
@@ -203,16 +219,23 @@ MSWOBJS = $(MSWDIR)\accel.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 \
@@ -238,6 +261,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 \
@@ -247,12 +271,12 @@ MSWOBJS = $(MSWDIR)\accel.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 \
-               $(MSWDIR)\xpmhand.obj
+               $(MSWDIR)\window.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
@@ -262,8 +286,11 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
        erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P1024 @&&!
-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+       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
@@ -333,10 +360,14 @@ $(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
 $(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
 
+$(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)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
@@ -345,14 +376,24 @@ $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
 $(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
 
+$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
+
+$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
+
 $(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
 $(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
 
-$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
+$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
+
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
+
+$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
@@ -403,6 +444,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)
@@ -421,6 +464,8 @@ $(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)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
@@ -431,8 +476,6 @@ $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
-
 
 
 ########################################################
@@ -444,27 +487,31 @@ $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
 
+$(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(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)\date.obj: $(COMMDIR)\date.$(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)\dobjcmn.obj: $(COMMDIR)\d$(SRCSUFF)cmn.obj
+$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
+
+$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
 
 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
@@ -474,6 +521,10 @@ $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(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
@@ -486,18 +537,26 @@ $(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)
 
+$(MSWDIR)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
+
 $(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(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)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
+$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
+
 $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
@@ -512,6 +571,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -524,20 +585,28 @@ $(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
 $(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)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
-$(MSWDIR)\object.obj: $(COMMDIR)\$(SRCSUFF)ect.obj
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
 
-$(MSWDIR)\objstrm.obj: $(COMMDIR)\$(SRCSUFF)strm.obj
+$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
 
 $(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
 $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
 $(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF)
@@ -552,18 +621,16 @@ $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
 $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
-$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(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)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
+
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 $(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
@@ -586,11 +653,13 @@ $(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.cpp: ${COMMDIR}\resourc2.cpp
+${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
 
 
 
@@ -600,12 +669,22 @@ ${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
 
 $(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)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
 $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
@@ -620,6 +699,8 @@ $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
+$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
+
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
 $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
@@ -632,17 +713,25 @@ $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
+
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
 $(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
+$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
+
 $(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)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+
+$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
 
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
@@ -663,21 +752,7 @@ all_execs:
     make -f makefile.bcc all_execs
     cd $(WXDIR)\src\msw
 
-all_libs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
-          wxstring wxtree mfutils # wxxpm
-
-all_contribs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.bcc fafa wxstring itsy gauge # wxxpm
-
 # CONTRIB
-wxxpm: $(CFG)
-       cd $(WXDIR)\src\xpm
-       make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
-       cd $(WXDIR)\src\msw
-
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.bcc
@@ -715,7 +790,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__