compile fix for BC++

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 785c8bd4806af8ac99040c2d67033844e9cd9c82..3ce7211577ee77ace7720cb4d7dc6fe2916fccfe 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -74,6 +74,7 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
 GENERICOBJS= \
+  ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\gridg.obj \
   ..\generic\$D\laywin.obj \
@@ -97,6 +98,7 @@ GENERICOBJS= \
 #  ..\generic\$D\notebook.obj \
 
 GENLIBOBJS= \
+  caret.obj \
   choicdgg.obj \
   gridg.obj \
   laywin.obj \
@@ -281,10 +283,66 @@ COMLIBOBJS2 = \
   fs_zip.obj
 
 OS2OBJS = \
+  ..\os2\$D\accel.obj \
+  ..\os2\$D\app.obj \
+  ..\os2\$D\bitmap.obj \
+  ..\os2\$D\bmpbuttn.obj \
+  ..\os2\$D\brush.obj \
+  ..\os2\$D\button.obj \
+  ..\os2\$D\checkbox.obj \
+  ..\os2\$D\checklst.obj \
+  ..\os2\$D\choice.obj \
+  ..\os2\$D\clipbrd.obj \
+  ..\os2\$D\colordlg.obj \
+  ..\os2\$D\colour.obj \
+  ..\os2\$D\combobox.obj \
+  ..\os2\$D\control.obj \
+  ..\os2\$D\cursor.obj \
+  ..\os2\$D\data.obj \
   ..\os2\$D\dc.obj \
+  ..\os2\$D\dcclient.obj \
+  ..\os2\$D\dcmemory.obj \
+  ..\os2\$D\dcprint.obj \
+  ..\os2\$D\dcscreen.obj \
   ..\os2\$D\dialog.obj \
+  ..\os2\$D\dirdlg.obj \
+  ..\os2\$D\dnd.obj \
+  ..\os2\$D\filedlg.obj \
+  ..\os2\$D\font.obj \
+  ..\os2\$D\fontdlg.obj \
   ..\os2\$D\frame.obj \
-  ..\os2\$D\window.obj \
+  ..\os2\$D\window.obj
+
+OS2LIBOBJS = \
+  accel.obj \
+  app.obj \
+  bitmap.obj \
+  bmpbuttn.obj \
+  brush.obj \
+  button.obj \
+  checkbox.obj \
+  checklst.obj \
+  choice.obj \
+  clipbrd.obj \
+  colordlg.obj \
+  colour.obj \
+  combobox.obj \
+  control.obj \
+  cursor.obj \
+  data.obj \
+  dc.obj \
+  dcclient.obj \
+  dcmemory.obj \
+  dcprint.obj \
+  dcscreen.obj \
+  dialog.obj \
+  dirdlg.obj \
+  dnd.obj \
+  filedlg.obj \
+  font.obj \
+  fontdlg.obj \
+  frame.obj \
+  window.obj
 
 HTMLOBJS = \
   ..\html\$D\htmlcell.obj \
@@ -412,6 +470,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\fs_zip.obj
 
 $(GENLIBOBJS):
+  copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\gridg.obj
   copy ..\generic\$D\laywin.obj
@@ -429,6 +488,37 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\busyinfo.obj
 
+$(OS2LIBOBJS):
+  copy ..\os2\$D\accel.obj
+  copy ..\os2\$D\app.obj
+  copy ..\os2\$D\bitmap.obj
+  copy ..\os2\$D\bmpbuttn.obj
+  copy ..\os2\$D\brush.obj
+  copy ..\os2\$D\button.obj
+  copy ..\os2\$D\checkbox.obj
+  copy ..\os2\$D\checklst.obj
+  copy ..\os2\$D\choice.obj
+  copy ..\os2\$D\clipbrd.obj
+  copy ..\os2\$D\colordlg.obj
+  copy ..\os2\$D\colour.obj
+  copy ..\os2\$D\combobox.obj
+  copy ..\os2\$D\control.obj
+  copy ..\os2\$D\cursor.obj
+  copy ..\os2\$D\data.obj
+  copy ..\os2\$D\dc.obj
+  copy ..\os2\$D\dcclient.obj
+  copy ..\os2\$D\dcmemory.obj
+  copy ..\os2\$D\dcprint.obj
+  copy ..\os2\$D\dcscreen.obj
+  copy ..\os2\$D\dialog.obj
+  copy ..\os2\$D\dirdlg.obj
+  copy ..\os2\$D\dnd.obj
+  copy ..\os2\$D\filedlg.obj
+  copy ..\os2\$D\font.obj
+  copy ..\os2\$D\fontdlg.obj
+  copy ..\os2\$D\frame.obj
+  copy ..\os2\$D\window.obj
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.va all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -484,7 +574,6 @@ $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
- del *.obj
 
 $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
  touch $(WXDIR)\lib\wxnones.lib
@@ -493,12 +582,13 @@ $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
     $**;
 <<
 
-$(WXDIR)\lib\wxos2.lib: $(OS2OBJS)
+$(WXDIR)\lib\wxos2.lib: $(OS2LIBOBJS)
  touch $(WXDIR)\lib\wxos2.lib
  del $(WXDIR)\lib\wxos2.lib
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
+ del *.obj
 
 $(WXDIR)\lib\wx.lib: \
   $D\dummy.obj \