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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index aa7be11a3f..1f34428748 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -105,6 +105,7 @@ GENERICOBJS= \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \
   ..\generic\$D\grid.obj \
+  ..\generic\$D\gridctrl.obj \
   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
@@ -123,7 +124,8 @@ 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 \
@@ -149,6 +151,7 @@ GENLIBOBJS= \
   dragimgg.obj \
   fontdlgg.obj \
   grid.obj \
+  gridctrl.obj \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \
@@ -167,7 +170,8 @@ GENLIBOBJS= \
   propform.obj \
   proplist.obj \
   sashwin.obj \
-  scrolwin.obj \
+  scrlwing.obj \
+  spinctlg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
@@ -190,6 +194,7 @@ COMMONOBJS = \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
+  ..\common\$D\cmdproc.obj \
   ..\common\$D\config.obj \
   ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
@@ -199,9 +204,11 @@ COMMONOBJS = \
 !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 \
@@ -226,6 +233,7 @@ COMMONOBJS = \
   ..\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 \
@@ -241,6 +249,7 @@ COMMONOBJS = \
   ..\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 \
@@ -254,6 +263,7 @@ 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"
@@ -261,10 +271,12 @@ COMMONOBJS = \
   ..\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\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
@@ -276,6 +288,7 @@ 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 \
@@ -294,6 +307,7 @@ 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
@@ -304,6 +318,7 @@ COMLIBOBJS1 = \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \
+  cmdproc.obj \
   config.obj \
   cshelp.obj \
   ctrlcmn.obj \
@@ -311,8 +326,10 @@ COMLIBOBJS1 = \
   datetime.obj \
   datstrm.obj \
   db.obj \
+  dbgrid.obj \
   dbtable.obj \
   dcbase.obj \
+  dircmn.obj \
   dndcmn.obj \
   dlgcmn.obj \
   dobjcmn.obj \
@@ -337,14 +354,15 @@ COMLIBOBJS1 = \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
+  gaugecmn.obj \
   gdicmn.obj \
-  geometry.obj \
+  geometry.obj
+
+COMLIBOBJS2 = \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
-  http.obj
-
-COMLIBOBJS2 = \
+  http.obj \
   imagall.obj \
   imagbmp.obj \
   image.obj \
@@ -354,6 +372,7 @@ COMLIBOBJS2 = \
   imagpng.obj \
   imagpnm.obj \
   imagtiff.obj \
+  imagxpm.obj \
   intl.obj \
   ipcbase.obj \
   layout.obj \
@@ -367,18 +386,23 @@ 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 \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
-  sckipc.obj \
+  sckipc.obj
+
+COMLIBOBJS3 = \
   sckstrm.obj \
   serbase.obj \
   sizer.obj \
@@ -386,9 +410,8 @@ COMLIBOBJS2 = \
   strconv.obj \
   stream.obj \
   string.obj \
-  tbarbase.obj
-
-COMLIBOBJS3 = \
+  sysopt.obj \
+  tbarbase.obj \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \
@@ -406,6 +429,7 @@ COMLIBOBJS3 = \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \
+  xpmdecod.obj \
   y_tab.obj \
   zipstrm.obj \
   zstream.obj
@@ -446,6 +470,7 @@ OS2OBJS = \
   ..\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 \
@@ -527,6 +552,7 @@ OS2LIBOBJS1 = \
   gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
+  gsockpm.obj \
   helpwin.obj \
   icon.obj \
   iniconf.obj \
@@ -535,10 +561,10 @@ OS2LIBOBJS1 = \
   main.obj \
   mdi.obj \
   menu.obj \
-  menuitem.obj \
-  metafile.obj
+  menuitem.obj
 
 OS2LIBOBJS2 = \
+  metafile.obj \
   mimetype.obj \
   minifram.obj \
   msgdlg.obj \
@@ -642,6 +668,7 @@ $(COMLIBOBJS1):
   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\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
@@ -649,9 +676,11 @@ $(COMLIBOBJS1):
   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
@@ -675,14 +704,15 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
+  copy ..\common\$D\gaugecmn.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
+
+$(COMLIBOBJS2):
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
-
-$(COMLIBOBJS2):
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
@@ -692,6 +722,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\imagpng.obj
   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
@@ -705,18 +736,23 @@ $(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\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\sckstrm.obj
   copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj
@@ -724,9 +760,8 @@ $(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
-
-$(COMLIBOBJS3):
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
@@ -744,6 +779,7 @@ $(COMLIBOBJS3):
   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
@@ -759,6 +795,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.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
@@ -777,7 +814,8 @@ $(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
@@ -847,6 +885,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
@@ -856,9 +895,9 @@ $(OS2LIBOBJS1):
   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
@@ -930,57 +969,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) $@ @<<
     $**;
 <<
@@ -997,8 +1036,8 @@ $(WXDIR)\lib\wx.lib: \
   $(OS2TEMPTGT1) \
   $(OS2TEMPTGT2) \
   $(PERIPH_LIBS)
- touch $(LIBTARGET)
- del $(LIBTARGET)
+ -touch $(LIBTARGET)
+ -del $(LIBTARGET)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<