X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf1e7142564c55f5299f1f2d0909090534eb97c..bd77da975b1aeeb52c56d2aacb02beec039b5bc3:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index b97f8c2444..39be3bc7f5 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -26,7 +26,8 @@ COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
 COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
 GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
 NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
-OS2TEMPTGT=$(WXDIR)\lib\wxos2.lib
+OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
+OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
 DUMMYOBJ=$D\dummy.obj
 !endif
 
@@ -133,160 +134,194 @@ NONESSENTIALOBJS= \
   ..\generic\$D\fontdlgg.obj
 
 COMMONOBJS = \
+  ..\common\$D\appcmn.obj \
+  ..\common\$D\choiccmn.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
-  ..\common\$D\dcbase.obj \
+  ..\common\$D\ctrlcmn.obj \
+  ..\common\$D\date.obj \
+  ..\common\$D\datstrm.obj \
   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \
-  ..\common\$D\docview.obj \
+  ..\common\$D\dcbase.obj \
+  ..\common\$D\dlgcmn.obj \
+  ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
+  ..\common\$D\docview.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
   ..\common\$D\event.obj \
+  ..\common\$D\extended.obj \
+  ..\common\$D\ffile.obj \
   ..\common\$D\file.obj \
-  ..\common\$D\filefn.obj \
   ..\common\$D\fileconf.obj \
+  ..\common\$D\filefn.obj \
+  ..\common\$D\filesys.obj \
+  ..\common\$D\fontcmn.obj \
   ..\common\$D\framecmn.obj \
+  ..\common\$D\fs_inet.obj \
+  ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
   ..\common\$D\gdicmn.obj \
-  ..\common\$D\image.obj \
+  ..\common\$D\gifdecod.obj \
+  ..\common\$D\hash.obj \
+  ..\common\$D\helpbase.obj \
+  ..\common\$D\http.obj \
+  ..\common\$D\imagall.obj \
   ..\common\$D\imagbmp.obj \
+  ..\common\$D\image.obj \
+  ..\common\$D\imaggif.obj \
   ..\common\$D\imagjpeg.obj \
+  ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
-  ..\common\$D\imaggif.obj \
+  ..\common\$D\imagpnm.obj \
   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
-  ..\common\$D\helpbase.obj \
   ..\common\$D\layout.obj \
+  ..\common\$D\list.obj \
   ..\common\$D\log.obj \
+  ..\common\$D\longlong.obj \
+  ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
   ..\common\$D\mimetype.obj \
   ..\common\$D\module.obj \
-  ..\common\$D\odbc.obj \
+  ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
+  ..\common\$D\objstrm.obj \
+  ..\common\$D\odbc.obj \
+  ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
+  ..\common\$D\process.obj \
+  ..\common\$D\protocol.obj \
   ..\common\$D\resource.obj \
+  ..\common\$D\sckaddr.obj \
+  ..\common\$D\sckfile.obj \
+  ..\common\$D\sckipc.obj \
+  ..\common\$D\sckstrm.obj \
+  ..\common\$D\serbase.obj \
+  ..\common\$D\sizer.obj \
+  ..\common\$D\socket.obj \
+  ..\common\$D\strconv.obj \
+  ..\common\$D\stream.obj \
+  ..\common\$D\string.obj \
   ..\common\$D\tbarbase.obj \
   ..\common\$D\tbarsmpl.obj \
+  ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
+  ..\common\$D\time.obj \
   ..\common\$D\timercmn.obj \
+  ..\common\$D\tokenzr.obj \
+  ..\common\$D\txtstrm.obj \
+  ..\common\$D\unzip.obj \
+  ..\common\$D\url.obj \
   ..\common\$D\utilscmn.obj \
-  ..\common\$D\validate.obj \
   ..\common\$D\valgen.obj \
+  ..\common\$D\validate.obj \
   ..\common\$D\valtext.obj \
-  ..\common\$D\date.obj \
-  ..\common\$D\hash.obj \
-  ..\common\$D\list.obj \
-  ..\common\$D\paper.obj \
-  ..\common\$D\string.obj \
-  ..\common\$D\socket.obj \
-  ..\common\$D\sckaddr.obj \
-  ..\common\$D\sckfile.obj \
-  ..\common\$D\sckipc.obj \
-  ..\common\$D\sckstrm.obj \
-  ..\common\$D\url.obj \
-  ..\common\$D\http.obj \
-  ..\common\$D\protocol.obj \
-  ..\common\$D\time.obj \
-  ..\common\$D\tokenzr.obj \
-  ..\common\$D\wxexpr.obj \
-  ..\common\$D\y_tab.obj \
-  ..\common\$D\extended.obj \
-  ..\common\$D\process.obj \
-  ..\common\$D\wfstream.obj \
-  ..\common\$D\mstream.obj \
-  ..\common\$D\zstream.obj \
-  ..\common\$D\stream.obj \
-  ..\common\$D\datstrm.obj \
-  ..\common\$D\objstrm.obj \
   ..\common\$D\variant.obj \
-  ..\common\$D\dlgcmn.obj \
+  ..\common\$D\wfstream.obj \
   ..\common\$D\wincmn.obj \
-  ..\common\$D\txtstrm.obj \
   ..\common\$D\wxchar.obj \
-  ..\common\$D\unzip.obj \
-  ..\common\$D\filesys.obj \
-  ..\common\$D\fs_inet.obj \
-  ..\common\$D\fs_zip.obj
+  ..\common\$D\wxexpr.obj \
+  ..\common\$D\y_tab.obj \
+  ..\common\$D\zipstrm.obj \
+  ..\common\$D\zstream.obj
 
 COMLIBOBJS1 = \
+  appcmn.obj \
+  choiccmn.obj \
   cmndata.obj \
   config.obj \
-  dcbase.obj \
+  ctrlcmn.obj \
+  date.obj \
+  datstrm.obj \
   db.obj \
   dbtable.obj \
-  docview.obj \
+  dcbase.obj \
+  dlgcmn.obj \
+  dobjcmn.obj \
   docmdi.obj \
+  docview.obj \
   dynarray.obj \
   dynlib.obj \
   event.obj \
+  extended.obj \
+  ffile.obj \
   file.obj \
-  filefn.obj \
   fileconf.obj \
+  filefn.obj \
+  filesys.obj \
+  fontcmn.obj \
   framecmn.obj \
+  fs_inet.obj \
+  fs_zip.obj \
   ftp.obj \
   gdicmn.obj \
-  image.obj \
+  gifdecod.obj \
+  hash.obj \
+  helpbase.obj \
+  http.obj \
+  imagall.obj \
   imagbmp.obj \
+  image.obj \
+  imaggif.obj \
   imagjpeg.obj \
+  imagpcx.obj \
   imagpng.obj \
-  imaggif.obj \
+  imagpnm.obj \
   intl.obj \
   ipcbase.obj \
-  helpbase.obj \
   layout.obj \
-  log.obj \
+  list.obj \
+  log.obj
+
+COMLIBOBJS2 = \
+  longlong.obj \
+  matrix.obj \
   memory.obj \
   mimetype.obj \
   module.obj \
-  odbc.obj \
+  mstream.obj \
   object.obj \
+  objstrm.obj \
+  odbc.obj \
+  paper.obj \
   prntbase.obj \
+  process.obj \
+  protocol.obj \
   resource.obj \
+  sckaddr.obj \
+  sckfile.obj \
+  sckipc.obj \
+  sckstrm.obj \
+  serbase.obj \
+  sizer.obj \
+  socket.obj \
+  strconv.obj \
+  stream.obj \
+  string.obj \
   tbarbase.obj \
   tbarsmpl.obj \
+  textcmn.obj \
   textfile.obj \
+  time.obj \
   timercmn.obj \
+  tokenzr.obj \
+  txtstrm.obj \
+  unzip.obj \
+  url.obj \
   utilscmn.obj \
-  validate.obj \
   valgen.obj \
+  validate.obj \
   valtext.obj \
-  date.obj \
-  hash.obj \
-  list.obj \
-  paper.obj
-
-COMLIBOBJS2 = \
-  string.obj \
-  socket.obj \
-  sckaddr.obj \
-  sckfile.obj \
-  sckipc.obj \
-  sckstrm.obj \
-  url.obj \
-  http.obj \
-  protocol.obj \
-  time.obj \
-  tokenzr.obj \
-  wxexpr.obj \
-  y_tab.obj \
-  extended.obj \
-  process.obj \
-  wfstream.obj \
-  mstream.obj \
-  zstream.obj \
-  stream.obj \
-  datstrm.obj \
-  objstrm.obj \
   variant.obj \
-  dlgcmn.obj \
+  wfstream.obj \
   wincmn.obj \
-  txtstrm.obj \
   wxchar.obj \
-  unzip.obj \
-  filesys.obj \
-  fs_inet.obj \
-  fs_zip.obj
+  wxexpr.obj \
+  y_tab.obj \
+  zipstrm.obj \
+  zstream.obj
 
 OS2OBJS = \
   ..\os2\$D\accel.obj \
@@ -299,12 +334,12 @@ OS2OBJS = \
   ..\os2\$D\checklst.obj \
   ..\os2\$D\choice.obj \
   ..\os2\$D\clipbrd.obj \
-  ..\os2\$D\colordlg.obj \
   ..\os2\$D\colour.obj \
   ..\os2\$D\combobox.obj \
   ..\os2\$D\control.obj \
   ..\os2\$D\cursor.obj \
   ..\os2\$D\data.obj \
+  ..\os2\$D\dataobj.obj \
   ..\os2\$D\dc.obj \
   ..\os2\$D\dcclient.obj \
   ..\os2\$D\dcmemory.obj \
@@ -339,13 +374,34 @@ OS2OBJS = \
   ..\os2\$D\ownerdrw.obj \
   ..\os2\$D\palette.obj \
   ..\os2\$D\pen.obj \
-  ..\os2\$D\pngread.obj \
+  ..\os2\$D\pnghand.obj \
   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \
   ..\os2\$D\radiobut.obj \
+  ..\os2\$D\region.obj \
+  ..\os2\$D\scrolbar.obj \
+  ..\os2\$D\settings.obj \
+  ..\os2\$D\slider.obj \
+  ..\os2\$D\spinbutt.obj \
+  ..\os2\$D\spinctrl.obj \
+  ..\os2\$D\statbmp.obj \
+  ..\os2\$D\statbox.obj \
+  ..\os2\$D\stattext.obj \
+  ..\os2\$D\statbrpm.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\treectrl.obj \
+  ..\os2\$D\utils.obj \
+  ..\os2\$D\utilsexc.obj \
+  ..\os2\$D\wave.obj \
   ..\os2\$D\window.obj
 
-OS2LIBOBJS = \
+OS2LIBOBJS1 = \
   accel.obj \
   app.obj \
   bitmap.obj \
@@ -356,12 +412,12 @@ OS2LIBOBJS = \
   checklst.obj \
   choice.obj \
   clipbrd.obj \
-  colordlg.obj \
   colour.obj \
   combobox.obj \
   control.obj \
   cursor.obj \
   data.obj \
+  dataobj.obj \
   dc.obj \
   dcclient.obj \
   dcmemory.obj \
@@ -390,16 +446,39 @@ OS2LIBOBJS = \
   menuitem.obj \
   metafile.obj \
   minifram.obj \
-  msgdlg.obj \
+  msgdlg.obj
+
+OS2LIBOBJS2 = \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
-  pngread.obj \
+  pnghand.obj \
   print.obj \
   radiobox.obj \
   radiobut.obj \
+  region.obj \
+  scrolbar.obj \
+  settings.obj \
+  slider.obj \
+  spinbutt.obj \
+  spinctrl.obj \
+  statbmp.obj \
+  statbox.obj \
+  stattext.obj \
+  statbrpm.obj \
+  tabctrl.obj \
+  taskbar.obj \
+  textctrl.obj \
+  thread.obj \
+  timer.obj \
+  toolbar.obj \
+  tooltip.obj \
+  treectrl.obj \
+  utils.obj \
+  utilsexc.obj \
+  wave.obj \
   window.obj
 
 HTMLOBJS = \
@@ -449,83 +528,100 @@ $(HTMLDIR)\$D:
     md $(HTMLDIR)\$D
 
 $(COMLIBOBJS1):
+  copy ..\common\$D\appcmn.obj
+  copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
-  copy ..\common\$D\dcbase.obj
+  copy ..\common\$D\ctrlcmn.obj
+  copy ..\common\$D\date.obj
+  copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj
   copy ..\common\$D\dbtable.obj
-  copy ..\common\$D\docview.obj
+  copy ..\common\$D\dcbase.obj
+  copy ..\common\$D\dlgcmn.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\event.obj
+  copy ..\common\$D\extended.obj
+  copy ..\common\$D\ffile.obj
   copy ..\common\$D\file.obj
-  copy ..\common\$D\filefn.obj
   copy ..\common\$D\fileconf.obj
+  copy ..\common\$D\filefn.obj
+  copy ..\common\$D\filesys.obj
+  copy ..\common\$D\fontcmn.obj
   copy ..\common\$D\framecmn.obj
+  copy ..\common\$D\fs_inet.obj
+  copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gdicmn.obj
-  copy ..\common\$D\image.obj
+  copy ..\common\$D\gifdecod.obj
+  copy ..\common\$D\hash.obj
+  copy ..\common\$D\helpbase.obj
+  copy ..\common\$D\http.obj
+  copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
+  copy ..\common\$D\image.obj
+  copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
+  copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
-  copy ..\common\$D\imaggif.obj
+  copy ..\common\$D\imagpnm.obj
   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
-  copy ..\common\$D\helpbase.obj
   copy ..\common\$D\layout.obj
-  copy ..\common\$D\log.obj
-  copy ..\common\$D\memory.obj
-  copy ..\common\$D\mimetype.obj
-  copy ..\common\$D\module.obj
-  copy ..\common\$D\odbc.obj
-  copy ..\common\$D\object.obj
-  copy ..\common\$D\prntbase.obj
-  copy ..\common\$D\resource.obj
-  copy ..\common\$D\tbarbase.obj
-  copy ..\common\$D\tbarsmpl.obj
-  copy ..\common\$D\textfile.obj
-  copy ..\common\$D\timercmn.obj
-  copy ..\common\$D\utilscmn.obj
-  copy ..\common\$D\validate.obj
-  copy ..\common\$D\valgen.obj
-  copy ..\common\$D\valtext.obj
-  copy ..\common\$D\date.obj
-  copy ..\common\$D\hash.obj
   copy ..\common\$D\list.obj
-  copy ..\common\$D\paper.obj
+  copy ..\common\$D\log.obj
 
 $(COMLIBOBJS2):
-  copy ..\common\$D\string.obj
-  copy ..\common\$D\socket.obj
-  copy ..\common\$D\sckaddr.obj
-  copy ..\common\$D\sckfile.obj
-  copy ..\common\$D\sckipc.obj
-  copy ..\common\$D\sckstrm.obj
-  copy ..\common\$D\url.obj
-  copy ..\common\$D\http.obj
-  copy ..\common\$D\protocol.obj
-  copy ..\common\$D\time.obj
-  copy ..\common\$D\tokenzr.obj
-  copy ..\common\$D\wxexpr.obj
-  copy ..\common\$D\y_tab.obj
-  copy ..\common\$D\extended.obj
-  copy ..\common\$D\process.obj
-  copy ..\common\$D\wfstream.obj
-  copy ..\common\$D\mstream.obj
+  copy ..\common\$D\longlong.obj \
+  copy ..\common\$D\matrix.obj \
+  copy ..\common\$D\memory.obj \
+  copy ..\common\$D\mimetype.obj \
+  copy ..\common\$D\module.obj \
+  copy ..\common\$D\mstream.obj \
+  copy ..\common\$D\object.obj \
+  copy ..\common\$D\objstrm.obj \
+  copy ..\common\$D\odbc.obj \
+  copy ..\common\$D\paper.obj \
+  copy ..\common\$D\prntbase.obj \
+  copy ..\common\$D\process.obj \
+  copy ..\common\$D\protocol.obj \
+  copy ..\common\$D\resource.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\sizer.obj \
+  copy ..\common\$D\socket.obj \
+  copy ..\common\$D\strconv.obj \
+  copy ..\common\$D\stream.obj \
+  copy ..\common\$D\string.obj \
+  copy ..\common\$D\tbarbase.obj \
+  copy ..\common\$D\tbarsmpl.obj \
+  copy ..\common\$D\textcmn.obj \
+  copy ..\common\$D\textfile.obj \
+  copy ..\common\$D\time.obj \
+  copy ..\common\$D\timercmn.obj \
+  copy ..\common\$D\tokenzr.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 \
+  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\y_tab.obj \
+  copy ..\common\$D\zipstrm.obj \
   copy ..\common\$D\zstream.obj
-  copy ..\common\$D\stream.obj
-  copy ..\common\$D\datstrm.obj
-  copy ..\common\$D\objstrm.obj
-  copy ..\common\$D\variant.obj
-  copy ..\common\$D\dlgcmn.obj
-  copy ..\common\$D\wincmn.obj
-  copy ..\common\$D\txtstrm.obj
-  copy ..\common\$D\wxchar.obj
-  copy ..\common\$D\unzip.obj
-  copy ..\common\$D\filesys.obj
-  copy ..\common\$D\fs_inet.obj
-  copy ..\common\$D\fs_zip.obj
 
 $(GENLIBOBJS):
   copy ..\generic\$D\caret.obj
@@ -546,7 +642,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\busyinfo.obj
 
-$(OS2LIBOBJS):
+$(OS2LIBOBJS1):
   copy ..\os2\$D\accel.obj
   copy ..\os2\$D\app.obj
   copy ..\os2\$D\bitmap.obj
@@ -557,7 +653,6 @@ $(OS2LIBOBJS):
   copy ..\os2\$D\checklst.obj
   copy ..\os2\$D\choice.obj
   copy ..\os2\$D\clipbrd.obj
-  copy ..\os2\$D\colordlg.obj
   copy ..\os2\$D\colour.obj
   copy ..\os2\$D\combobox.obj
   copy ..\os2\$D\control.obj
@@ -593,14 +688,37 @@ $(OS2LIBOBJS):
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
+
+$(OS2LIBOBJS2):
   copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
-  copy ..\os2\$D\pallet.obj
+  copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj
-  copy ..\os2\$D\pngread.obj
+  copy ..\os2\$D\pnghand.obj
   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj
   copy ..\os2\$D\radiobut.obj
+  copy ..\os2\$D\region.obj
+  copy ..\os2\$D\scrolbar.obj
+  copy ..\os2\$D\settings.obj
+  copy ..\os2\$D\slider.obj
+  copy ..\os2\$D\spinbutt.obj
+  copy ..\os2\$D\spinctrl.obj
+  copy ..\os2\$D\statbmp.obj
+  copy ..\os2\$D\statbox.obj
+  copy ..\os2\$D\stattext.obj
+  copy ..\os2\$D\statbrpm.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\treectrl.obj
+  copy ..\os2\$D\utils.obj
+  copy ..\os2\$D\utilsexc.obj
+  copy ..\os2\$D\wave.obj
   copy ..\os2\$D\window.obj
 
 # wxWindows library as DLL
@@ -666,9 +784,16 @@ $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
     $**;
 <<
 
-$(WXDIR)\lib\wxos2.lib: $(OS2LIBOBJS)
- touch $(WXDIR)\lib\wxos2.lib
- del $(WXDIR)\lib\wxos2.lib
+$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
+ 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
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
@@ -680,7 +805,8 @@ $(WXDIR)\lib\wx.lib: \
   $(COMTEMPTGT2) \
   $(GENTEMPTGT) \
   $(NONESTEMPTGT) \
-  $(OS2TEMPTGT) \
+  $(OS2TEMPTGT1) \
+  $(OS2TEMPTGT2) \
   $(PERIPH_LIBS)
  touch $(LIBTARGET)
  del $(LIBTARGET)
@@ -691,21 +817,22 @@ $(WXDIR)\lib\wx.lib: \
   del $(COMTEMPTGT2)
   del $(GENTEMPTGT)
   del $(NONESTEMPTGT)
-  del $(OS2TEMPTGT)
+  del $(OS2TEMPTGT1)
+  del $(OS2TEMPTGT2)
 
 !else
 
 # Update the import library
-$(WXDIR)\lib\wx200.lib: $(OBJECTS)
-    implib $(WXDIR)\lib\wx200.lib $(WXDIR)\lib\wx200.def
+$(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\wx200.lib
+$(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(OBJECTS)
-    $(WXDIR)\lib\wx200.def
+    $(WXDIR)\lib\wx210.def
 <<
 
 !endif