X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/319445fe634b0b3730261914a08571d69cd8e311..e72aa7f5ac0347b1115ffce7eafa58ddc2936ebc:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 1c79306dda..7419a88133 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -101,7 +101,13 @@ GENERICOBJS= \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.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 \
@@ -112,7 +118,6 @@ GENERICOBJS= \
   ..\generic\$D\logg.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
-  ..\generic\$D\plot.obj \
   ..\generic\$D\printps.obj \
   ..\generic\$D\prntdlgg.obj \
   ..\generic\$D\progdlgg.obj \
@@ -120,13 +125,18 @@ GENERICOBJS= \
   ..\generic\$D\propform.obj \
   ..\generic\$D\proplist.obj \
   ..\generic\$D\sashwin.obj \
-  ..\generic\$D\scrolwin.obj \
+  ..\generic\$D\scrlwing.obj \
+  ..\generic\$D\spinctlg.obj \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
+  ..\generic\$D\tbarsmpl.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
-  ..\generic\$D\treectrl.obj
+  ..\generic\$D\tipwin.obj \
+  ..\generic\$D\treectlg.obj \
+  ..\generic\$D\treelay.obj \
+  ..\generic\$D\wizard.obj
 
 #  ..\generic\$D\gridg.obj \
 #  ..\generic\$D\notebook.obj \
@@ -138,7 +148,13 @@ GENLIBOBJS= \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
+  dirctrlg.obj \
+  dragimgg.obj \
+  fontdlgg.obj \
+  fdrepdlg.obj \
   grid.obj \
+  gridctrl.obj \
+  gridsel.obj \
   helpext.obj \
   helphtml.obj \
   helpwxht.obj \
@@ -149,7 +165,6 @@ GENLIBOBJS= \
   logg.obj \
   numdlgg.obj \
   panelg.obj \
-  plot.obj \
   printps.obj \
   prntdlgg.obj \
   progdlgg.obj \
@@ -157,54 +172,75 @@ GENLIBOBJS= \
   propform.obj \
   proplist.obj \
   sashwin.obj \
-  scrolwin.obj \
+  scrlwing.obj \
+  spinctlg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
+  tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.obj \
-  treectrl.obj
+  tipwin.obj \
+  treectlg.obj \
+  treelay.obj \
+  wizard.obj
 
 # These are generic things that don't need to be compiled on PM,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= \
-  ..\generic\$D\msgdlgg.obj \
-  ..\generic\$D\fontdlgg.obj
+  ..\generic\$D\msgdlgg.obj
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
+  ..\common\$D\bmpbase.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
+  ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
+  ..\common\$D\cmdproc.obj \
   ..\common\$D\config.obj \
+  ..\common\$D\containr.obj \
+  ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.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 \
+  ..\common\$D\dndcmn.obj \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\effects.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \
+  ..\common\$D\fddlgcmn.obj \
   ..\common\$D\ffile.obj \
   ..\common\$D\file.obj \
   ..\common\$D\fileconf.obj \
   ..\common\$D\filefn.obj \
+  ..\common\$D\filename.obj \
   ..\common\$D\filesys.obj \
   ..\common\$D\fontcmn.obj \
   ..\common\$D\fontmap.obj \
   ..\common\$D\framecmn.obj \
   ..\common\$D\fs_inet.obj \
+  ..\common\$D\fs_mem.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
+  ..\common\$D\gaugecmn.obj \
   ..\common\$D\gdicmn.obj \
+  ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
   ..\common\$D\helpbase.obj \
@@ -217,6 +253,8 @@ COMMONOBJS = \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
   ..\common\$D\imagpnm.obj \
+  ..\common\$D\imagtiff.obj \
+  ..\common\$D\imagxpm.obj \
   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
   ..\common\$D\layout.obj \
@@ -230,12 +268,21 @@ COMMONOBJS = \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.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 \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
+  ..\common\$D\quantize.obj \
+  ..\common\$D\radiocmn.obj \
+  ..\common\$D\regex.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
@@ -247,11 +294,13 @@ COMMONOBJS = \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
+  ..\common\$D\sysopt.obj \
   ..\common\$D\tbarbase.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
   ..\common\$D\timercmn.obj \
   ..\common\$D\tokenzr.obj \
+  ..\common\$D\treebase.obj \
   ..\common\$D\txtstrm.obj \
   ..\common\$D\unzip.obj \
   ..\common\$D\url.obj \
@@ -264,44 +313,61 @@ COMMONOBJS = \
   ..\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 = \
   appcmn.obj \
+  bmpbase.obj \
   choiccmn.obj \
   clipcmn.obj \
+  cmdline.obj \
   cmndata.obj \
+  cmdproc.obj \
   config.obj \
+  containr.obj \
+  cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
   datstrm.obj \
   db.obj \
+  dbgrid.obj \
   dbtable.obj \
   dcbase.obj \
+  dircmn.obj \
+  dndcmn.obj \
   dlgcmn.obj \
   dobjcmn.obj \
   docmdi.obj \
   docview.obj \
   dynarray.obj \
   dynlib.obj \
+  effects.obj \
   encconv.obj \
   event.obj \
   extended.obj \
+  fddlgcmn.obj \
   ffile.obj \
   file.obj \
   fileconf.obj \
   filefn.obj \
+  filename.obj \
   filesys.obj \
   fontcmn.obj \
   fontmap.obj \
   framecmn.obj \
   fs_inet.obj \
+  fs_mem.obj \
   fs_zip.obj \
-  ftp.obj \
+  ftp.obj
+
+COMLIBOBJS2 = \
+  gaugecmn.obj \
   gdicmn.obj \
+  geometry.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
@@ -312,10 +378,10 @@ COMLIBOBJS1 = \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
-  imagpng.obj
-
-COMLIBOBJS2 = \
+  imagpng.obj \
   imagpnm.obj \
+  imagtiff.obj \
+  imagxpm.obj \
   intl.obj \
   ipcbase.obj \
   layout.obj \
@@ -329,12 +395,20 @@ COMLIBOBJS2 = \
   mimecmn.obj \
   module.obj \
   mstream.obj \
+  nbkbase.obj \
   object.obj \
   objstrm.obj \
+  odbc.obj \
   paper.obj \
+  popupcmn.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
+  quantize.obj \
+  radiocmn.obj \
+  regex.obj
+
+COMLIBOBJS3 = \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
@@ -346,25 +420,26 @@ COMLIBOBJS2 = \
   strconv.obj \
   stream.obj \
   string.obj \
+  sysopt.obj \
   tbarbase.obj \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \
   tokenzr.obj \
+  treebase.obj \
   txtstrm.obj \
   unzip.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \
-  validate.obj
-
-COMLIBOBJS3 = \
+  validate.obj \
   valtext.obj \
   variant.obj \
   wfstream.obj \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \
+  xpmdecod.obj \
   y_tab.obj \
   zipstrm.obj \
   zstream.obj
@@ -392,6 +467,7 @@ OS2OBJS = \
   ..\os2\$D\dcprint.obj \
   ..\os2\$D\dcscreen.obj \
   ..\os2\$D\dialog.obj \
+  ..\os2\$D\dir.obj \
   ..\os2\$D\dirdlg.obj \
   ..\os2\$D\dnd.obj \
   ..\os2\$D\filedlg.obj \
@@ -401,9 +477,10 @@ OS2OBJS = \
   ..\os2\$D\fontutil.obj \
   ..\os2\$D\frame.obj \
   ..\os2\$D\gauge.obj \
-  ..\os2\$D\gdiobj.obj \
   ..\os2\$D\gdiimage.obj \
+  ..\os2\$D\gdiobj.obj \
   ..\os2\$D\gsocket.obj \
+  ..\os2\$D\gsockpm.obj \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
   ..\os2\$D\iniconf.obj \
@@ -446,7 +523,8 @@ OS2OBJS = \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
-  ..\os2\$D\window.obj
+  ..\os2\$D\window.obj \
+  ..\os2\$D\xpmhand.obj
 
 OS2LIBOBJS1 = \
   accel.obj \
@@ -471,6 +549,7 @@ OS2LIBOBJS1 = \
   dcprint.obj \
   dcscreen.obj \
   dialog.obj \
+  dir.obj \
   dirdlg.obj \
   dnd.obj \
   filedlg.obj \
@@ -483,6 +562,7 @@ OS2LIBOBJS1 = \
   gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
+  gsockpm.obj \
   helpwin.obj \
   icon.obj \
   iniconf.obj \
@@ -491,11 +571,11 @@ OS2LIBOBJS1 = \
   main.obj \
   mdi.obj \
   menu.obj \
-  menuitem.obj \
-  metafile.obj \
-  mimetype.obj
+  menuitem.obj
 
 OS2LIBOBJS2 = \
+  metafile.obj \
+  mimetype.obj \
   minifram.obj \
   msgdlg.obj \
   nativdlg.obj \
@@ -527,7 +607,8 @@ OS2LIBOBJS2 = \
   utils.obj \
   utilsexc.obj \
   wave.obj \
-  window.obj
+  window.obj \
+  xpmhand.obj
 
 HTMLOBJS = \
   ..\html\$D\helpctrl.obj \
@@ -539,12 +620,14 @@ HTMLOBJS = \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
   ..\html\$D\htmprint.obj \
+  ..\html\$D\m_dflist.obj \
   ..\html\$D\m_fonts.obj \
   ..\html\$D\m_hline.obj \
   ..\html\$D\m_image.obj \
   ..\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_tables.obj \
   ..\html\$D\winpars.obj
@@ -559,12 +642,14 @@ HTMLLIBOBJS = \
   htmltag.obj \
   htmlwin.obj \
   htmprint.obj \
+  m_dflist.obj \
   m_fonts.obj \
   m_hline.obj \
   m_image.obj \
   m_layout.obj \
   m_links.obj \
   m_list.obj \
+  m_meta.obj \
   m_pre.obj \
   m_tables.obj \
   winpars.obj
@@ -573,7 +658,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -585,44 +670,58 @@ $D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
 
 $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
-        icc @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+        icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
+  copy ..\common\$D\bmpbase.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
+  copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
+  copy ..\common\$D\cmdproc.obj
   copy ..\common\$D\config.obj
+  copy ..\common\$D\containr.obj
+  copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.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
+  copy ..\common\$D\dndcmn.obj
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\effects.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj
+  copy ..\common\$D\fddlgcmn.obj
   copy ..\common\$D\ffile.obj
   copy ..\common\$D\file.obj
   copy ..\common\$D\fileconf.obj
   copy ..\common\$D\filefn.obj
+  copy ..\common\$D\filename.obj
   copy ..\common\$D\filesys.obj
   copy ..\common\$D\fontcmn.obj
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
+  copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
+
+$(COMLIBOBJS2):
+  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\helpbase.obj
@@ -634,9 +733,9 @@ $(COMLIBOBJS1):
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
-
-$(COMLIBOBJS2):
   copy ..\common\$D\imagpnm.obj
+  copy ..\common\$D\imagtiff.obj
+  copy ..\common\$D\imagxpm.obj
   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
@@ -650,12 +749,20 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.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
   copy ..\common\$D\paper.obj
+  copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
+  copy ..\common\$D\quantize.obj
+  copy ..\common\$D\radiocmn.obj
+  copy ..\common\$D\regex.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
@@ -667,25 +774,26 @@ $(COMLIBOBJS2):
   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\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
   copy ..\common\$D\tokenzr.obj
+  copy ..\common\$D\treebase.obj
   copy ..\common\$D\txtstrm.obj
   copy ..\common\$D\unzip.obj
   copy ..\common\$D\url.obj
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
-
-$(COMLIBOBJS3):
   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
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
@@ -696,8 +804,14 @@ $(GENLIBOBJS):
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
+  copy ..\generic\$D\dragimgg.obj
   copy ..\generic\$D\dcpsg.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
@@ -708,7 +822,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
-  copy ..\generic\$D\plot.obj
   copy ..\generic\$D\printps.obj
   copy ..\generic\$D\prntdlgg.obj
   copy ..\generic\$D\progdlgg.obj
@@ -716,13 +829,18 @@ $(GENLIBOBJS):
   copy ..\generic\$D\propform.obj
   copy ..\generic\$D\proplist.obj
   copy ..\generic\$D\sashwin.obj
-  copy ..\generic\$D\scrolwin.obj
+  copy ..\generic\$D\scrlwing.obj
+  copy ..\generic\$D\spinctlg.obj
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj
+  copy ..\generic\$D\tbarsmpl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
-  copy ..\generic\$D\treectrl.obj
+  copy ..\generic\$D\tipwin.obj
+  copy ..\generic\$D\treectlg.obj
+  copy ..\generic\$D\treelay.obj
+  copy ..\generic\$D\wizard.obj
 
 $(HTMLLIBOBJS):
   copy ..\html\$D\helpctrl.obj
@@ -734,12 +852,14 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\htmltag.obj
   copy ..\html\$D\htmlwin.obj
   copy ..\html\$D\htmprint.obj
+  copy ..\html\$D\m_dflist.obj
   copy ..\html\$D\m_fonts.obj
   copy ..\html\$D\m_hline.obj
   copy ..\html\$D\m_image.obj
   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_tables.obj
   copy ..\html\$D\winpars.obj
@@ -767,6 +887,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\dcprint.obj
   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
@@ -779,6 +900,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\gdiimage.obj
   copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\gsocket.obj
+  copy ..\os2\$D\gsockpm.obj
   copy ..\os2\$D\helpwin.obj
   copy ..\os2\$D\icon.obj
   copy ..\os2\$D\iniconf.obj
@@ -788,10 +910,10 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
-  copy ..\os2\$D\metafile.obj
-  copy ..\os2\$D\mimetype.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
@@ -824,6 +946,7 @@ $(OS2LIBOBJS2):
   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:
@@ -861,57 +984,57 @@ pch1:   dirs $(DUMMYOBJ)
 ### Static library
 
 $(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1)
- touch $(WXDIR)\lib\wxcom1.lib
- del $(WXDIR)\lib\wxcom1.lib
+ -touch $(WXDIR)\lib\wxcom1.lib
+ -del $(WXDIR)\lib\wxcom1.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2)
- touch $(WXDIR)\lib\wxcom2.lib
- del $(WXDIR)\lib\wxcom2.lib
+ -touch $(WXDIR)\lib\wxcom2.lib
+ -del $(WXDIR)\lib\wxcom2.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
- touch $(WXDIR)\lib\wxcom3.lib
- del $(WXDIR)\lib\wxcom3.lib
+ -touch $(WXDIR)\lib\wxcom3.lib
+ -del $(WXDIR)\lib\wxcom3.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
- touch $(WXDIR)\lib\wxgen.lib
- del $(WXDIR)\lib\wxgen.lib
+ -touch $(WXDIR)\lib\wxgen.lib
+ -del $(WXDIR)\lib\wxgen.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
- touch $(WXDIR)\lib\wxhtml.lib
- del $(WXDIR)\lib\wxhtml.lib
+ -touch $(WXDIR)\lib\wxhtml.lib
+ -del $(WXDIR)\lib\wxhtml.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
- touch $(WXDIR)\lib\wxnones.lib
- del $(WXDIR)\lib\wxnones.lib
+ -touch $(WXDIR)\lib\wxnones.lib
+ -del $(WXDIR)\lib\wxnones.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
- touch $(WXDIR)\lib\wxos21.lib
- del $(WXDIR)\lib\wxos21.lib
+ -touch $(WXDIR)\lib\wxos21.lib
+ -del $(WXDIR)\lib\wxos21.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
- touch $(WXDIR)\lib\wxos22.lib
- del $(WXDIR)\lib\wxos22.lib
+ -touch $(WXDIR)\lib\wxos22.lib
+ -del $(WXDIR)\lib\wxos22.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
@@ -928,34 +1051,32 @@ $(WXDIR)\lib\wx.lib: \
   $(OS2TEMPTGT1) \
   $(OS2TEMPTGT2) \
   $(PERIPH_LIBS)
- touch $(LIBTARGET)
- del $(LIBTARGET)
+ -touch $(LIBTARGET)
+ -del $(LIBTARGET)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
-  del $(COMTEMPTGT1)
-  del $(COMTEMPTGT2)
-  del $(COMTEMPTGT3)
-  del $(GENTEMPTGT)
-  del $(HTMLTEMPTGT)
-  del $(NONESTEMPTGT)
-  del $(OS2TEMPTGT1)
-  del $(OS2TEMPTGT2)
+ del $(COMTEMPTGT1)
+ del $(COMTEMPTGT2)
+ del $(COMTEMPTGT3)
+ del $(GENTEMPTGT)
+ del $(HTMLTEMPTGT)
+ del $(NONESTEMPTGT)
+ del $(OS2TEMPTGT1)
+ del $(OS2TEMPTGT2)
 
 !else
 
-# Update the import library
-$(WXDIR)\lib\wx210.lib: $(OBJECTS)
-    implib $(WXDIR)\lib\wx210.lib $(WXDIR)\lib\wx210.def
-
 # Update the dynamic link library
-$(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
+$(WXDIR)\lib\wx23.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
+    $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\lib\wx210.def
+    $(WXDIR)\src\os2\wx23.def
 <<
+    implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
 
 !endif
 
@@ -1027,22 +1148,32 @@ clean_xpm:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
-        del      $(LIBTARGET)
-!if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx200.lib
-!endif
+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj
-        erase /N $(COMMDIR)\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c
         rd       $(D)
         rd      ..\generic\$D
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D
+        del      $(LIBTARGET)
+!if "$(WXMAKINGDLL)" == "1"
+        erase /N ..\..\lib\wx23.lib
+!endif
+        erase /N $(COMMDIR)\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
 
 cleanall: clean