Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / src / os2 / makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index da64a017cae7a982ae3040e42212d61141acdb0a..6b662e3db8d97be548fddacfc7fa7538cedbe6f5 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -25,6 +25,7 @@ LIBTARGET=$(WXLIB)
 COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
 COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
 COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib
+COMTEMPTGT4=$(WXDIR)\lib\wxcom4.lib
 GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
 NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
 OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
@@ -100,22 +101,21 @@ GENERICOBJS= \
   ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
+  ..\generic\$D\dcbuffer.obj \
   ..\generic\$D\dcpsg.obj \
+  ..\generic\$D\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
-  ..\generic\$D\fontdlgg.obj \
   ..\generic\$D\fdrepdlg.obj \
   ..\generic\$D\grid.obj \
   ..\generic\$D\gridctrl.obj \
   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
-  ..\generic\$D\helpwxht.obj \
-  ..\generic\$D\helpxlp.obj \
   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
-  ..\generic\$D\listctrl.obj \
   ..\generic\$D\logg.obj \
+  ..\generic\$D\mdig.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
   ..\generic\$D\printps.obj \
@@ -134,8 +134,6 @@ GENERICOBJS= \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\tipwin.obj \
-  ..\generic\$D\treectlg.obj \
-  ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 
 #  ..\generic\$D\gridg.obj \
@@ -147,22 +145,21 @@ GENLIBOBJS= \
   caret.obj \
   choicdgg.obj \
   colrdlgg.obj \
+  dcbuffer.obj \
   dcpsg.obj \
+  dirdlgg.obj \
   dirctrlg.obj \
   dragimgg.obj \
-  fontdlgg.obj \
   fdrepdlg.obj \
   grid.obj \
   gridctrl.obj \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \
-  helpwxht.obj \
-  helpxlp.obj \
   imaglist.obj \
   laywin.obj \
-  listctrl.obj \
   logg.obj \
+  mdig.obj \
   numdlgg.obj \
   panelg.obj \
   printps.obj \
@@ -181,8 +178,6 @@ GENLIBOBJS= \
   textdlgg.obj \
   tipdlg.obj \
   tipwin.obj \
-  treectlg.obj \
-  treelay.obj \
   wizard.obj
 
 # These are generic things that don't need to be compiled on PM,
@@ -191,6 +186,9 @@ NONESSENTIALOBJS= \
   ..\generic\$D\msgdlgg.obj
 
 COMMONOBJS = \
+  ..\common\$D\accesscmn.obj \
+  ..\common\$D\artprov.obj \
+  ..\common\$D\artstd.obj \
   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
@@ -203,14 +201,9 @@ COMMONOBJS = \
   ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
+  ..\common\$D\datacmn.obj \
   ..\common\$D\datetime.obj \
   ..\common\$D\datstrm.obj \
-!if "$(WXMAKINGDLL)" != "1"
-# don't have an ODBC database
-  ..\common\$D\db.obj \
-  ..\common\$D\dbgrid.obj \
-  ..\common\$D\dbtable.obj \
-!endif
   ..\common\$D\dcbase.obj \
   ..\common\$D\dircmn.obj \
   ..\common\$D\dlgcmn.obj \
@@ -218,8 +211,11 @@ COMMONOBJS = \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
+  ..\common\$D\dpycmn.obj \
+  ..\common\$D\dseldlg.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\dynload.obj \
   ..\common\$D\effects.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
@@ -243,12 +239,16 @@ COMMONOBJS = \
   ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
+  ..\common\$D\hashmap.obj \
   ..\common\$D\helpbase.obj \
   ..\common\$D\http.obj \
+  ..\common\$D\iconbndl.obj \
   ..\common\$D\imagall.obj \
   ..\common\$D\imagbmp.obj \
   ..\common\$D\image.obj \
+  ..\common\$D\imagfill.obj \
   ..\common\$D\imaggif.obj \
+  ..\common\$D\imagiff.obj \
   ..\common\$D\imagjpeg.obj \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
@@ -267,14 +267,10 @@ COMMONOBJS = \
   ..\common\$D\menucmn.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
+  ..\common\$D\msgout.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
-  ..\common\$D\objstrm.obj \
-!if "$(WXMAKINGDLL)" != "1"
-# don't have an ODBC database
-  ..\common\$D\odbc.obj \
-!endif
   ..\common\$D\paper.obj \
   ..\common\$D\popupcmn.obj \
   ..\common\$D\prntbase.obj \
@@ -283,19 +279,21 @@ COMMONOBJS = \
   ..\common\$D\quantize.obj \
   ..\common\$D\radiocmn.obj \
   ..\common\$D\regex.obj \
-  ..\common\$D\resource.obj \
+  ..\common\$D\rgncmn.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \
-  ..\common\$D\serbase.obj \
+  ..\common\$D\settcmn.obj \
   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
+  ..\common\$D\statbar.obj \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
   ..\common\$D\sysopt.obj \
   ..\common\$D\tbarbase.obj \
+  ..\common\$D\textbuf.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
   ..\common\$D\timercmn.obj \
@@ -309,17 +307,17 @@ COMMONOBJS = \
   ..\common\$D\valgen.obj \
   ..\common\$D\validate.obj \
   ..\common\$D\valtext.obj \
-  ..\common\$D\variant.obj \
   ..\common\$D\wfstream.obj \
   ..\common\$D\wincmn.obj \
   ..\common\$D\wxchar.obj \
-  ..\common\$D\wxexpr.obj \
   ..\common\$D\xpmdecod.obj \
-  ..\common\$D\y_tab.obj \
   ..\common\$D\zipstrm.obj \
   ..\common\$D\zstream.obj
 
 COMLIBOBJS1 = \
+  accesscmn.obj \
+  artprov.obj \
+  artstd.obj \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \
@@ -332,11 +330,9 @@ COMLIBOBJS1 = \
   cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
+  datacmn.obj \
   datetime.obj \
   datstrm.obj \
-  db.obj \
-  dbgrid.obj \
-  dbtable.obj \
   dcbase.obj \
   dircmn.obj \
   dndcmn.obj \
@@ -344,8 +340,11 @@ COMLIBOBJS1 = \
   dobjcmn.obj \
   docmdi.obj \
   docview.obj \
+  dseldlg.obj \
+  dpycmn.obj \
   dynarray.obj \
   dynlib.obj \
+  dynload.obj \
   effects.obj \
   encconv.obj \
   event.obj \
@@ -359,24 +358,28 @@ COMLIBOBJS1 = \
   filesys.obj \
   fontcmn.obj \
   fontmap.obj \
+
+COMLIBOBJS2 = \
   framecmn.obj \
   fs_inet.obj \
   fs_mem.obj \
-  fs_zip.obj
-
-COMLIBOBJS2 = \
+  fs_zip.obj \
   ftp.obj \
   gaugecmn.obj \
   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \
   hash.obj \
+  hashmap.obj \
   helpbase.obj \
   http.obj \
+  iconbndl.obj \
   imagall.obj \
   imagbmp.obj \
   image.obj \
+  imagfill.obj \
   imaggif.obj \
+  imagiff.obj \
   imagjpeg.obj \
   imagpcx.obj \
   imagpng.obj \
@@ -395,34 +398,35 @@ COMLIBOBJS2 = \
   menucmn.obj \
   mimecmn.obj \
   module.obj \
+  msgout.obj \
   mstream.obj \
   nbkbase.obj \
-  object.obj \
-  objstrm.obj \
-  odbc.obj \
+  object.obj
+
+COMLIBOBJS3 = \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \
-  radiocmn.obj
-
-COMLIBOBJS3 = \
+  radiocmn.obj \
   regex.obj \
-  resource.obj \
+  rgncmn.obj \
   sckaddr.obj \
   sckfile.obj \
   sckipc.obj \
   sckstrm.obj \
-  serbase.obj \
+  settcmn.obj \
   sizer.obj \
   socket.obj \
+  statbar.obj \
   strconv.obj \
   stream.obj \
   string.obj \
   sysopt.obj \
   tbarbase.obj \
+  textbuf.obj \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \
@@ -436,13 +440,12 @@ COMLIBOBJS3 = \
   valgen.obj \
   validate.obj \
   valtext.obj \
-  variant.obj \
   wfstream.obj \
   wincmn.obj \
   wxchar.obj \
-  wxexpr.obj \
-  xpmdecod.obj \
-  y_tab.obj \
+  xpmdecod.obj
+
+COMLIBOBJS4 = \
   zipstrm.obj \
   zstream.obj
 
@@ -470,7 +473,6 @@ OS2OBJS = \
   ..\os2\$D\dcscreen.obj \
   ..\os2\$D\dialog.obj \
   ..\os2\$D\dir.obj \
-  ..\os2\$D\dirdlg.obj \
   ..\os2\$D\dnd.obj \
   ..\os2\$D\filedlg.obj \
   ..\os2\$D\font.obj \
@@ -488,20 +490,19 @@ OS2OBJS = \
   ..\os2\$D\iniconf.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
+  ..\os2\$D\listctrl.obj \
   ..\os2\$D\main.obj \
-  ..\os2\$D\mdi.obj \
   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
   ..\os2\$D\mimetype.obj \
-  ..\os2\$D\minifram.obj \
   ..\os2\$D\msgdlg.obj \
   ..\os2\$D\nativdlg.obj \
   ..\os2\$D\notebook.obj \
   ..\os2\$D\ownerdrw.obj \
   ..\os2\$D\palette.obj \
   ..\os2\$D\pen.obj \
-  ..\os2\$D\pnghand.obj \
+  ..\os2\$D\popupwin.obj \
   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \
   ..\os2\$D\radiobut.obj \
@@ -516,17 +517,17 @@ OS2OBJS = \
   ..\os2\$D\statline.obj \
   ..\os2\$D\stattext.obj \
   ..\os2\$D\tabctrl.obj \
-  ..\os2\$D\taskbar.obj \
   ..\os2\$D\textctrl.obj \
   ..\os2\$D\thread.obj \
   ..\os2\$D\timer.obj \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
+  ..\os2\$D\toplevel.obj \
+  ..\os2\$D\treectrl.obj \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
-  ..\os2\$D\window.obj \
-  ..\os2\$D\xpmhand.obj
+  ..\os2\$D\window.obj
 
 OS2LIBOBJS1 = \
   accel.obj \
@@ -552,7 +553,6 @@ OS2LIBOBJS1 = \
   dcscreen.obj \
   dialog.obj \
   dir.obj \
-  dirdlg.obj \
   dnd.obj \
   filedlg.obj \
   font.obj \
@@ -570,22 +570,21 @@ OS2LIBOBJS1 = \
   iniconf.obj \
   joystick.obj \
   listbox.obj \
+  listctrl.obj \
   main.obj \
-  mdi.obj \
   menu.obj \
-  menuitem.obj
+  menuitem.obj \
+  metafile.obj
 
 OS2LIBOBJS2 = \
-  metafile.obj \
   mimetype.obj \
-  minifram.obj \
   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
-  pnghand.obj \
+  popupwin.obj \
   print.obj \
   radiobox.obj \
   radiobut.obj \
@@ -600,17 +599,17 @@ OS2LIBOBJS2 = \
   stattext.obj \
   statline.obj \
   tabctrl.obj \
-  taskbar.obj \
   textctrl.obj \
   thread.obj \
   timer.obj \
   toolbar.obj \
   tooltip.obj \
+  toplevel.obj \
+  treectrl.obj \
   utils.obj \
   utilsexc.obj \
   wave.obj \
-  window.obj \
-  xpmhand.obj
+  window.obj
 
 HTMLOBJS = \
   ..\html\$D\helpctrl.obj \
@@ -629,8 +628,8 @@ HTMLOBJS = \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \
-  ..\html\$D\m_meta.obj \
   ..\html\$D\m_pre.obj \
+  ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\winpars.obj
 
@@ -651,8 +650,8 @@ HTMLLIBOBJS = \
   m_layout.obj \
   m_links.obj \
   m_list.obj \
-  m_meta.obj \
   m_pre.obj \
+  m_style.obj \
   m_tables.obj \
   winpars.obj
 
@@ -660,7 +659,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
+all:  $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -682,6 +681,9 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
 
 $(COMLIBOBJS1):
+  copy ..\common\$D\accesscmn.obj
+  copy ..\common\$D\artprov.obj
+  copy ..\common\$D\artstd.obj
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
@@ -694,11 +696,9 @@ $(COMLIBOBJS1):
   copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
+  copy ..\common\$D\datacmn.obj
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
-  copy ..\common\$D\db.obj
-  copy ..\common\$D\dbgrid.obj
-  copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
   copy ..\common\$D\dircmn.obj
@@ -706,8 +706,11 @@ $(COMLIBOBJS1):
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
+  copy ..\common\$D\dpycmn.obj
+  copy ..\common\$D\dseldlg.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\dynload.obj
   copy ..\common\$D\effects.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
@@ -721,24 +724,28 @@ $(COMLIBOBJS1):
   copy ..\common\$D\filesys.obj
   copy ..\common\$D\fontcmn.obj
   copy ..\common\$D\fontmap.obj
+
+$(COMLIBOBJS2):
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
-
-$(COMLIBOBJS2):
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gaugecmn.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
+  copy ..\common\$D\hashmap.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
+  copy ..\common\$D\iconbndl.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
+  copy ..\common\$D\imagfill.obj
   copy ..\common\$D\imaggif.obj
+  copy ..\common\$D\imagiff.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
@@ -757,11 +764,12 @@ $(COMLIBOBJS2):
   copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
+  copy ..\common\$D\msgout.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
-  copy ..\common\$D\objstrm.obj
-  copy ..\common\$D\odbc.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
@@ -769,22 +777,22 @@ $(COMLIBOBJS2):
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
   copy ..\common\$D\radiocmn.obj
-
-$(COMLIBOBJS3):
   copy ..\common\$D\regex.obj
-  copy ..\common\$D\resource.obj
+  copy ..\common\$D\rgncmn.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
   copy ..\common\$D\sckstrm.obj
-  copy ..\common\$D\serbase.obj
+  copy ..\common\$D\settcmn.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
+  copy ..\common\$D\statbar.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\sysopt.obj
   copy ..\common\$D\tbarbase.obj
+  copy ..\common\$D\textbuf.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
@@ -798,13 +806,12 @@ $(COMLIBOBJS3):
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
   copy ..\common\$D\valtext.obj
-  copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj
   copy ..\common\$D\wincmn.obj
   copy ..\common\$D\wxchar.obj
-  copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj
-  copy ..\common\$D\y_tab.obj
+
+$(COMLIBOBJS4):
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
 
@@ -815,21 +822,20 @@ $(GENLIBOBJS):
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\dragimgg.obj
+  copy ..\generic\$D\dcbuffer.obj
   copy ..\generic\$D\dcpsg.obj
+  copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj
-  copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\fdrepdlg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\gridctrl.obj
   copy ..\generic\$D\gridsel.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
-  copy ..\generic\$D\helpwxht.obj
-  copy ..\generic\$D\helpxlp.obj
   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
-  copy ..\generic\$D\listctrl.obj
   copy ..\generic\$D\logg.obj
+  copy ..\generic\$D\mdig.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
   copy ..\generic\$D\printps.obj
@@ -848,8 +854,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\tipwin.obj
-  copy ..\generic\$D\treectlg.obj
-  copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 
 $(HTMLLIBOBJS):
@@ -869,8 +873,8 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj
-  copy ..\html\$D\m_meta.obj
   copy ..\html\$D\m_pre.obj
+  copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\winpars.obj
 
@@ -898,7 +902,6 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\dcscreen.obj
   copy ..\os2\$D\dialog.obj
   copy ..\os2\$D\dir.obj
-  copy ..\os2\$D\dirdlg.obj
   copy ..\os2\$D\dnd.obj
   copy ..\os2\$D\filedlg.obj
   copy ..\os2\$D\font.obj
@@ -916,22 +919,21 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\iniconf.obj
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.obj
+  copy ..\os2\$D\listctrl.obj
   copy ..\os2\$D\main.obj
-  copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
+  copy ..\os2\$D\metafile.obj
 
 $(OS2LIBOBJS2):
-  copy ..\os2\$D\metafile.obj
   copy ..\os2\$D\mimetype.obj
-  copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj
-  copy ..\os2\$D\pnghand.obj
+  copy ..\os2\$D\popupwin.obj
   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj
   copy ..\os2\$D\radiobut.obj
@@ -946,17 +948,17 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\statline.obj
   copy ..\os2\$D\stattext.obj
   copy ..\os2\$D\tabctrl.obj
-  copy ..\os2\$D\taskbar.obj
   copy ..\os2\$D\textctrl.obj
   copy ..\os2\$D\thread.obj
   copy ..\os2\$D\timer.obj
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
+  copy ..\os2\$D\toplevel.obj
+  copy ..\os2\$D\treectrl.obj
   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
   copy ..\os2\$D\window.obj
-  copy ..\os2\$D\xpmhand.obj
 
 # wxWindows library as DLL
 dll:
@@ -1014,6 +1016,13 @@ $(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
     $**;
 <<
 
+$(WXDIR)\lib\wxcom4.lib: $(COMLIBOBJS4)
+ -touch $(WXDIR)\lib\wxcom4.lib
+ -del $(WXDIR)\lib\wxcom4.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
 $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
  -touch $(WXDIR)\lib\wxgen.lib
  -del $(WXDIR)\lib\wxgen.lib
@@ -1055,6 +1064,7 @@ $(WXDIR)\lib\wx.lib: \
   $(COMTEMPTGT1) \
   $(COMTEMPTGT2) \
   $(COMTEMPTGT3) \
+  $(COMTEMPTGT4) \
   $(GENTEMPTGT) \
   $(HTMLTEMPTGT) \
   $(NONESTEMPTGT) \
@@ -1069,6 +1079,7 @@ $(WXDIR)\lib\wx.lib: \
  del $(COMTEMPTGT1)
  del $(COMTEMPTGT2)
  del $(COMTEMPTGT3)
+ del $(COMTEMPTGT4)
  del $(GENTEMPTGT)
  del $(HTMLTEMPTGT)
  del $(NONESTEMPTGT)
@@ -1078,15 +1089,15 @@ $(WXDIR)\lib\wx.lib: \
 !else
 
 # Update the dynamic link library
-$(WXDIR)\lib\wx23.dll: $(OBJECTS)
+$(WXDIR)\lib\wx25.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\src\os2\wx23.def
+    $(WXDIR)\src\os2\wx25.def
 <<
-    implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
+    implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def
 
 !endif
 
@@ -1095,17 +1106,6 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS)
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c
 <<
 
-..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
-        icc @<<
-$(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@  ..\common\y_tab.c
-<<
-
-..\common\y_tab.c:     ..\common\dosyacc.c
-        copy "..\common"\dosyacc.c "..\common"\y_tab.c
-
-..\common\lex_yy.c:    ..\common\doslex.c
-    copy "..\common"\doslex.c "..\common"\lex_yy.c
-
 $(OBJECTS): $(WXDIR)/include/wx/setup.h
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
@@ -1143,16 +1143,6 @@ clean_jpeg:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
-    cd $(WXDIR)\src\os2
-
-clean_xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.va clean
-    cd $(WXDIR)\src\os2
-
 tiff:
     cd $(WXDIR)\src\tiff
     nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
@@ -1163,7 +1153,7 @@ clean_tiff:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
+clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
@@ -1173,12 +1163,10 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D
-        del      $(LIBTARGET)
+        del     ..\lib\wx.lib
 !if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx23.lib
+        del ..\lib\wx25.lib
 !endif
-        erase /N $(COMMDIR)\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c
 
 cleanall: clean