compilation fixes - wxGTK compiles but not links

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 560582afd0bf8a317133eb6488d54192a28e1fbd..8e938b9b24678ea5d54f46eadf4fa575c7aacfc1 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 \


@@ -149,6 +150,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 \


@@ -199,9 +201,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 \


@@ -313,8 +317,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 \


@@ -342,11 +348,11 @@ COMLIBOBJS1 = \
   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \
   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \

-  hash.obj \
-  helpbase.obj \
-  http.obj
+  hash.obj

 
 COMLIBOBJS2 = \
 
 COMLIBOBJS2 = \

+  helpbase.obj \
+  http.obj \

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


@@ -386,11 +392,11 @@ COMLIBOBJS2 = \
   serbase.obj \
   sizer.obj \
   socket.obj \
   serbase.obj \
   sizer.obj \
   socket.obj \

-  strconv.obj \
-  stream.obj \
-  string.obj
+  strconv.obj

 
 COMLIBOBJS3 = \
 
 COMLIBOBJS3 = \

+  stream.obj \
+  string.obj \

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


@@ -450,6 +456,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 +538,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 +547,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 \


@@ -653,9 +661,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


@@ -683,10 +693,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.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

 
 $(COMLIBOBJS2):
 
 $(COMLIBOBJS2):

+  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\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj


@@ -727,10 +737,10 @@ $(COMLIBOBJS2):
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\strconv.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

 
 $(COMLIBOBJS3):
 
 $(COMLIBOBJS3):

+  copy ..\common\$D\stream.obj
+  copy ..\common\$D\string.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 +775,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


@@ -853,6 +864,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 +874,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