]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.b32
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SendSizeEvent() method moved from wxWindow to wxFrame, as that is the only place...
[wxWidgets.git] / src / msw / makefile.b32
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 72b15494678cabdac874ca59f64c094ca6b04a3b..ff2944ef8c4ce59443d6c4bcd0b09f9e630518a3 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
 
 
-# This file was automatically generated by tmake at 18:17, 2000/01/05
+# This file was automatically generated by tmake at 19:20, 2001/02/08
 # 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,7 @@ 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
+USE_XPM_IN_MSW=1
 
 PERIPH_LIBS=
 PERIPH_TARGET=
 
 PERIPH_LIBS=
 PERIPH_TARGET=
@@ -51,21 +51,21 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
 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 $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(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 xpm zlib winpng jpeg tiff
 !endif
 
 LIBTARGET=$(WXLIB)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -81,7 +81,10 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dirctrlg.obj \
+               $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
@@ -92,11 +95,15 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
                $(MSWDIR)\scrolwin.obj \
                $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
                $(MSWDIR)\scrolwin.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)\wizard.obj
 
 # Not needed:
@@ -118,6 +125,7 @@ COMMONOBJS = \
                $(MSWDIR)\cmdline.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
                $(MSWDIR)\cmdline.obj \
                $(MSWDIR)\cmndata.obj \
                $(MSWDIR)\config.obj \
+               $(MSWDIR)\cshelp.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\ctrlcmn.obj \
                $(MSWDIR)\ctrlsub.obj \
                $(MSWDIR)\datetime.obj \
@@ -126,11 +134,13 @@ COMMONOBJS = \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \
+               $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.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)\encconv.obj \
                $(MSWDIR)\event.obj \
                $(MSWDIR)\extended.obj \
@@ -138,14 +148,17 @@ COMMONOBJS = \
                $(MSWDIR)\file.obj \
                $(MSWDIR)\fileconf.obj \
                $(MSWDIR)\filefn.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)\gdicmn.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\ftp.obj \
                $(MSWDIR)\gdicmn.obj \
+               $(MSWDIR)\geometry.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \
@@ -166,9 +179,10 @@ 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)\object.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\object.obj \
@@ -178,6 +192,7 @@ COMMONOBJS = \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\process.obj \
                $(MSWDIR)\protocol.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\process.obj \
                $(MSWDIR)\protocol.obj \
+               $(MSWDIR)\quantize.obj \
                $(MSWDIR)\resource.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\resource.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
@@ -194,6 +209,7 @@ COMMONOBJS = \
                $(MSWDIR)\textfile.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
                $(MSWDIR)\textfile.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\treebase.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\url.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\url.obj \
@@ -211,6 +227,7 @@ COMMONOBJS = \
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.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 \
@@ -243,6 +260,7 @@ 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)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -252,7 +270,10 @@ 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)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
@@ -264,6 +285,7 @@ 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)\nativdlg.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
@@ -294,6 +316,7 @@ 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 \
@@ -321,6 +344,7 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\m_layout.obj \
                $(MSWDIR)\m_links.obj \
                $(MSWDIR)\m_list.obj \
                $(MSWDIR)\m_layout.obj \
                $(MSWDIR)\m_links.obj \
                $(MSWDIR)\m_list.obj \
+               $(MSWDIR)\m_meta.obj \
                $(MSWDIR)\m_pre.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
                $(MSWDIR)\m_pre.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
@@ -337,7 +361,7 @@ all:        all_libs all_execs
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
 
 $(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 +)
 !
 
@@ -346,7 +370,7 @@ $(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
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul
@@ -378,6 +402,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)
@@ -442,6 +468,8 @@ $(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)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 $(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
@@ -460,8 +488,14 @@ $(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)\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)
@@ -484,6 +518,8 @@ $(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)
@@ -544,6 +580,8 @@ $(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)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
 $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
@@ -581,6 +619,8 @@ $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(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)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
@@ -597,6 +637,8 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(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)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
 
 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
@@ -607,6 +649,8 @@ $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(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)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
 
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
@@ -621,6 +665,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)
@@ -631,12 +677,16 @@ $(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)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(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)
@@ -677,11 +727,13 @@ $(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)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
@@ -701,6 +753,8 @@ $(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(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)
@@ -733,6 +787,8 @@ $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(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
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 $(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
@@ -773,8 +829,14 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(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)\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)
@@ -795,6 +857,8 @@ $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(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)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
@@ -805,6 +869,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)
 
 
@@ -844,6 +914,8 @@ $(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_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
 $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
@@ -908,11 +980,33 @@ clean_jpeg:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
+xpm:    $(CFG)
+        cd $(WXDIR)\src\xpm
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_xpm:
+        cd $(WXDIR)\src\xpm
+        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
 -R-
 -X
 -w-par
@@ -924,21 +1018,23 @@ $(CFG): makefile.b32
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
 -DWIN32
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
 -DWIN32
+-DWINVER=0x0400
+-D_WIN32_WINNT=0x0400
 $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
 $(OPT)
 $(DEBUG_FLAGS)
 $(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
wxWidgets (Impactor)