merged MapBitmap() from 2.2 branch

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 560582afd0bf8a317133eb6488d54192a28e1fbd..1f34428748bf1b52e5c4e1d0a4fce3b2ada198dc 100644 (file)
--- 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\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 \
   ..\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\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\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \


@@ -149,6 +151,7 @@ GENLIBOBJS= \
   dragimgg.obj \
   fontdlgg.obj \
   grid.obj \
   dragimgg.obj \
   fontdlgg.obj \
   grid.obj \

+  gridctrl.obj \

   gridsel.obj \
   helpext.obj \
   helphtml.obj \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \


@@ -167,7 +170,8 @@ GENLIBOBJS= \
   propform.obj \
   proplist.obj \
   sashwin.obj \
   propform.obj \
   proplist.obj \
   sashwin.obj \

-  scrolwin.obj \
+  scrlwing.obj \
+  spinctlg.obj \

   splitter.obj \
   statusbr.obj \
   tabg.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\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 \
   ..\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 \
 !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\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\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\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\gdicmn.obj \
   ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \


@@ -255,6 +263,7 @@ COMMONOBJS = \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\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"
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"


@@ -262,10 +271,12 @@ COMMONOBJS = \
   ..\common\$D\odbc.obj \
 !endif
   ..\common\$D\paper.obj \
   ..\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\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 \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \


@@ -277,6 +288,7 @@ COMMONOBJS = \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
   ..\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\tbarbase.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \


@@ -306,6 +318,7 @@ COMLIBOBJS1 = \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \

+  cmdproc.obj \

   config.obj \
   cshelp.obj \
   ctrlcmn.obj \
   config.obj \
   cshelp.obj \
   ctrlcmn.obj \


@@ -313,8 +326,10 @@ COMLIBOBJS1 = \
   datetime.obj \
   datstrm.obj \
   db.obj \
   datetime.obj \
   datstrm.obj \
   db.obj \

+  dbgrid.obj \

   dbtable.obj \
   dcbase.obj \
   dbtable.obj \
   dcbase.obj \

+  dircmn.obj \

   dndcmn.obj \
   dlgcmn.obj \
   dobjcmn.obj \
   dndcmn.obj \
   dlgcmn.obj \
   dobjcmn.obj \


@@ -339,14 +354,15 @@ COMLIBOBJS1 = \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \

+  gaugecmn.obj \

   gdicmn.obj \
   gdicmn.obj \

-  geometry.obj \
+  geometry.obj
+
+COMLIBOBJS2 = \

   gifdecod.obj \
   hash.obj \
   helpbase.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \

-  http.obj
-
-COMLIBOBJS2 = \
+  http.obj \

   imagall.obj \
   imagbmp.obj \
   image.obj \
   imagall.obj \
   imagbmp.obj \
   image.obj \


@@ -370,27 +386,31 @@ COMLIBOBJS2 = \
   mimecmn.obj \
   module.obj \
   mstream.obj \
   mimecmn.obj \
   module.obj \
   mstream.obj \

+  nbkbase.obj \

   object.obj \
   objstrm.obj \
   odbc.obj \
   paper.obj \
   object.obj \
   objstrm.obj \
   odbc.obj \
   paper.obj \

+  popupcmn.obj \

   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \

+  radiocmn.obj \

   resource.obj \
   sckaddr.obj \
   sckfile.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \

-  sckipc.obj \
+  sckipc.obj
+
+COMLIBOBJS3 = \

   sckstrm.obj \
   serbase.obj \
   sizer.obj \
   socket.obj \
   strconv.obj \
   stream.obj \
   sckstrm.obj \
   serbase.obj \
   sizer.obj \
   socket.obj \
   strconv.obj \
   stream.obj \

-  string.obj
-
-COMLIBOBJS3 = \
+  string.obj \
+  sysopt.obj \

   tbarbase.obj \
   textcmn.obj \
   textfile.obj \
   tbarbase.obj \
   textcmn.obj \
   textfile.obj \


@@ -450,6 +470,7 @@ OS2OBJS = \
   ..\os2\$D\gdiimage.obj \
   ..\os2\$D\gdiobj.obj \
   ..\os2\$D\gsocket.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 \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
   ..\os2\$D\iniconf.obj \


@@ -531,6 +552,7 @@ OS2LIBOBJS1 = \
   gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
   gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \

+  gsockpm.obj \

   helpwin.obj \
   icon.obj \
   iniconf.obj \
   helpwin.obj \
   icon.obj \
   iniconf.obj \


@@ -539,10 +561,10 @@ OS2LIBOBJS1 = \
   main.obj \
   mdi.obj \
   menu.obj \
   main.obj \
   mdi.obj \
   menu.obj \

-  menuitem.obj \
-  metafile.obj
+  menuitem.obj

 
 OS2LIBOBJS2 = \
 
 OS2LIBOBJS2 = \

+  metafile.obj \

   mimetype.obj \
   minifram.obj \
   msgdlg.obj \
   mimetype.obj \
   minifram.obj \
   msgdlg.obj \


@@ -646,6 +668,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.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\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj


@@ -653,9 +676,11 @@ $(COMLIBOBJS1):
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.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\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\dndcmn.obj
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj


@@ -679,14 +704,15 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   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
   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
   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
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj


@@ -710,18 +736,23 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
   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\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\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
   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
   copy ..\common\$D\sckstrm.obj
   copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj


@@ -729,8 +760,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj

-
-$(COMLIBOBJS3):
+  copy ..\common\$D\sysopt.obj

   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


@@ -765,6 +795,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\grid.obj
   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
   copy ..\generic\$D\gridsel.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj


@@ -783,7 +814,8 @@ $(GENLIBOBJS):
   copy ..\generic\$D\propform.obj
   copy ..\generic\$D\proplist.obj
   copy ..\generic\$D\sashwin.obj
   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\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj


@@ -853,6 +885,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\gdiimage.obj
   copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\gsocket.obj
   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
   copy ..\os2\$D\helpwin.obj
   copy ..\os2\$D\icon.obj
   copy ..\os2\$D\iniconf.obj


@@ -862,9 +895,9 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj

-  copy ..\os2\$D\metafile.obj

 
 $(OS2LIBOBJS2):
 
 $(OS2LIBOBJS2):

+  copy ..\os2\$D\metafile.obj

   copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj