image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index cde236d408f7653596078f99835e57aef0bfdb73..0332017631b70cf7b8952115680c156324fd835a 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -220,12 +220,12 @@ COMMONOBJS = \
   ..\common\$D\longlong.obj \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
+  ..\common\$D\menucmn.obj \
   ..\common\$D\mimetype.obj \
   ..\common\$D\module.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 \
@@ -319,12 +319,12 @@ COMLIBOBJS2 = \
   longlong.obj \
   matrix.obj \
   memory.obj \
+  menucmn.obj \
   mimetype.obj \
   module.obj \
   mstream.obj \
   object.obj \
   objstrm.obj \
-  odbc.obj \
   paper.obj \
   prntbase.obj \
   process.obj \
@@ -396,6 +396,7 @@ OS2OBJS = \
   ..\os2\$D\frame.obj \
   ..\os2\$D\gauge.obj \
   ..\os2\$D\gdiobj.obj \
+  ..\os2\$D\gdiimage.obj \
   ..\os2\$D\gsocket.obj \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
@@ -470,6 +471,7 @@ OS2LIBOBJS1 = \
   fontdlg.obj \
   frame.obj \
   gauge.obj \
+  gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
   helpwin.obj \
@@ -484,10 +486,10 @@ OS2LIBOBJS1 = \
   metafile.obj \
   minifram.obj \
   msgdlg.obj \
-  nativdlg.obj \
-  notebook.obj
+  nativdlg.obj
 
 OS2LIBOBJS2 = \
+  notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
@@ -518,6 +520,7 @@ OS2LIBOBJS2 = \
   window.obj
 
 HTMLOBJS = \
+  ..\html\$D\helpctrl.obj \
   ..\html\$D\helpdata.obj \
   ..\html\$D\helpfrm.obj \
   ..\html\$D\htmlcell.obj \
@@ -537,6 +540,7 @@ HTMLOBJS = \
   ..\html\$D\winpars.obj
 
 HTMLLIBOBJS = \
+  helpctrl.obj \
   helpdata.obj \
   helpfrm.obj \
   htmlcell.obj \
@@ -622,12 +626,12 @@ $(COMLIBOBJS2):
   copy ..\common\$D\longlong.obj
   copy ..\common\$D\matrix.obj
   copy ..\common\$D\memory.obj
+  copy ..\common\$D\menucmn.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
@@ -701,6 +705,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\treectrl.obj
 
 $(HTMLLIBOBJS):
+  copy ..\html\$D\helpctrl.obj
   copy ..\html\$D\helpdata.obj
   copy ..\html\$D\helpfrm.obj
   copy ..\html\$D\htmlcell.obj
@@ -749,6 +754,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\fontdlg.obj
   copy ..\os2\$D\frame.obj
   copy ..\os2\$D\gauge.obj
+  copy ..\os2\$D\gdiimage.obj
   copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\gsocket.obj
   copy ..\os2\$D\helpwin.obj
@@ -764,9 +770,9 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
-  copy ..\os2\$D\notebook.obj
 
 $(OS2LIBOBJS2):
+  copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj