]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/makefile.va
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed Cyrillic encodings
[wxWidgets.git] / src / os2 / makefile.va
diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 9f938f704c395c5098e503edfcf7a7a98e6bc175..ba49185c321fcb13075708a38e9af3ef8e8be47b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -101,7 +101,10 @@ GENERICOBJS= \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.obj \
+  ..\generic\$D\dragimgg.obj \
+  ..\generic\$D\fontdlgg.obj \
   ..\generic\$D\grid.obj \
   ..\generic\$D\grid.obj \
+  ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\helpwxht.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\helpwxht.obj \
@@ -124,9 +127,13 @@ GENERICOBJS= \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.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\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 \
 
 #  ..\generic\$D\gridg.obj \
 #  ..\generic\$D\notebook.obj \
@@ -138,7 +145,10 @@ GENLIBOBJS= \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
+  dragimgg.obj \
+  fontdlgg.obj \
   grid.obj \
   grid.obj \
+  gridsel.obj \
   helpext.obj \
   helphtml.obj \
   helpwxht.obj \
   helpext.obj \
   helphtml.obj \
   helpwxht.obj \
@@ -161,30 +171,39 @@ GENLIBOBJS= \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
+  tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.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= \
 
 # 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\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
+  ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
+  ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\datetime.obj \
   ..\common\$D\datstrm.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\dbtable.obj \
   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \
+!endif
   ..\common\$D\dcbase.obj \
   ..\common\$D\dlgcmn.obj \
   ..\common\$D\dcbase.obj \
   ..\common\$D\dlgcmn.obj \
+  ..\common\$D\dndcmn.obj \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
@@ -202,9 +221,11 @@ COMMONOBJS = \
   ..\common\$D\fontmap.obj \
   ..\common\$D\framecmn.obj \
   ..\common\$D\fs_inet.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\gdicmn.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
   ..\common\$D\gdicmn.obj \
+  ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
   ..\common\$D\helpbase.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
   ..\common\$D\helpbase.obj \
@@ -217,6 +238,7 @@ COMMONOBJS = \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
   ..\common\$D\imagpnm.obj \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
   ..\common\$D\imagpnm.obj \
+  ..\common\$D\imagtiff.obj \
   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
   ..\common\$D\layout.obj \
   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
   ..\common\$D\layout.obj \
@@ -232,10 +254,15 @@ COMMONOBJS = \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
   ..\common\$D\mstream.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\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
   ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
+  ..\common\$D\quantize.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
@@ -252,6 +279,7 @@ COMMONOBJS = \
   ..\common\$D\textfile.obj \
   ..\common\$D\timercmn.obj \
   ..\common\$D\tokenzr.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 \
   ..\common\$D\txtstrm.obj \
   ..\common\$D\unzip.obj \
   ..\common\$D\url.obj \
@@ -272,8 +300,10 @@ COMLIBOBJS1 = \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \
+  cmdline.obj \
   cmndata.obj \
   config.obj \
   cmndata.obj \
   config.obj \
+  cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
@@ -281,6 +311,7 @@ COMLIBOBJS1 = \
   db.obj \
   dbtable.obj \
   dcbase.obj \
   db.obj \
   dbtable.obj \
   dcbase.obj \
+  dndcmn.obj \
   dlgcmn.obj \
   dobjcmn.obj \
   docmdi.obj \
   dlgcmn.obj \
   dobjcmn.obj \
   docmdi.obj \
@@ -299,23 +330,26 @@ COMLIBOBJS1 = \
   fontmap.obj \
   framecmn.obj \
   fs_inet.obj \
   fontmap.obj \
   framecmn.obj \
   fs_inet.obj \
+  fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
   gdicmn.obj \
   fs_zip.obj \
   ftp.obj \
   gdicmn.obj \
+  geometry.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
   http.obj \
   imagall.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
   http.obj \
   imagall.obj \
-  imagbmp.obj \
+  imagbmp.obj
+
+COMLIBOBJS2 = \
   image.obj \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
   image.obj \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
-  imagpng.obj
-
-COMLIBOBJS2 = \
+  imagpng.obj \
   imagpnm.obj \
   imagpnm.obj \
+  imagtiff.obj \
   intl.obj \
   ipcbase.obj \
   layout.obj \
   intl.obj \
   ipcbase.obj \
   layout.obj \
@@ -331,10 +365,12 @@ COMLIBOBJS2 = \
   mstream.obj \
   object.obj \
   objstrm.obj \
   mstream.obj \
   object.obj \
   objstrm.obj \
+  odbc.obj \
   paper.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
   paper.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
+  quantize.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
@@ -348,17 +384,18 @@ COMLIBOBJS2 = \
   string.obj \
   tbarbase.obj \
   textcmn.obj \
   string.obj \
   tbarbase.obj \
   textcmn.obj \
-  textfile.obj \
+  textfile.obj
+
+COMLIBOBJS3 = \
   timercmn.obj \
   tokenzr.obj \
   timercmn.obj \
   tokenzr.obj \
+  treebase.obj \
   txtstrm.obj \
   unzip.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \
   txtstrm.obj \
   unzip.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \
-  validate.obj
-
-COMLIBOBJS3 = \
+  validate.obj \
   valtext.obj \
   variant.obj \
   wfstream.obj \
   valtext.obj \
   variant.obj \
   wfstream.obj \
@@ -539,12 +576,14 @@ HTMLOBJS = \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
   ..\html\$D\htmprint.obj \
   ..\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_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
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\winpars.obj
@@ -559,12 +598,14 @@ HTMLLIBOBJS = \
   htmltag.obj \
   htmlwin.obj \
   htmprint.obj \
   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_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
   m_pre.obj \
   m_tables.obj \
   winpars.obj
@@ -573,7 +614,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -585,16 +626,16 @@ $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\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\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
+  copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
+  copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
@@ -603,6 +644,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
+  copy ..\common\$D\dndcmn.obj
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
@@ -620,23 +662,26 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.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
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.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
   copy ..\common\$D\http.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.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
+
+$(COMLIBOBJS2):
   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\image.obj
   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
-
-$(COMLIBOBJS2):
   copy ..\common\$D\imagpnm.obj
   copy ..\common\$D\imagpnm.obj
+  copy ..\common\$D\imagtiff.obj
   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
@@ -652,10 +697,12 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.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\paper.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
+  copy ..\common\$D\quantize.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
@@ -670,16 +717,17 @@ $(COMLIBOBJS2):
   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\timercmn.obj
   copy ..\common\$D\tokenzr.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
   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\valtext.obj
   copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj
@@ -696,8 +744,11 @@ $(GENLIBOBJS):
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
   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\dcpsg.obj
+  copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\grid.obj
+  copy ..\generic\$D\gridsel.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\helpwxht.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\helpwxht.obj
@@ -720,9 +771,13 @@ $(GENLIBOBJS):
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.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\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
 
 $(HTMLLIBOBJS):
   copy ..\html\$D\helpctrl.obj
@@ -734,12 +789,14 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\htmltag.obj
   copy ..\html\$D\htmlwin.obj
   copy ..\html\$D\htmprint.obj
   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_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
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\winpars.obj
@@ -933,29 +990,27 @@ $(WXDIR)\lib\wx.lib: \
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
  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
 
 
 !else
 
-# Update the import library
-$(WXDIR)\lib\wx210.lib: $(OBJECTS)
-    implib $(WXDIR)\lib\wx210.lib $(WXDIR)\lib\wx210.def
-
 # Update the dynamic link library
 # Update the dynamic link library
-$(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
+$(WXDIR)\lib\wx22.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
+    $(DUMMYOBJ)
     $(OBJECTS)
     $(OBJECTS)
-    $(WXDIR)\lib\wx210.def
+    $(WXDIR)\lib\wx22.def
 <<
 <<
+    implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def
 
 !endif
 
 
 !endif
 
@@ -1037,11 +1092,7 @@ clean_tiff:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
-        del      $(LIBTARGET)
-!if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx200.lib
-!endif
+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 $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
@@ -1053,6 +1104,10 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_ti
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D
+        del      $(LIBTARGET)
+!if "$(WXMAKINGDLL)" == "1"
+        erase /N ..\..\lib\wx22.lib
+!endif
 
 cleanall: clean
 
 
 cleanall: clean
 
wxWidgets (Impactor)