X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de44a9f06d5c9f925de9ae98e426991ed279ceef..8e00741dbdf74ee5583ea8b0134f01023c8f2480:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 1d9e08b016..9f9526ac33 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -22,6 +22,12 @@ LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
 DUMMYOBJ=$D\dummydll.obj
 !else
 LIBTARGET=$(WXLIB)
+COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
+COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
+GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
+NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
+OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
+OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
 DUMMYOBJ=$D\dummy.obj
 !endif
 
@@ -62,6 +68,12 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
+{..\os2}.c{..\os2\$D}.obj:
+    @echo $<
+    icc @<<
+$(CPPFLAGS) /Fo$@ /Tp $<
+<<
+
 {..\html}.cpp{..\html\$D}.obj:
     @echo $<
     icc @<<
@@ -69,6 +81,7 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
 GENERICOBJS= \
+  ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\gridg.obj \
   ..\generic\$D\laywin.obj \
@@ -83,7 +96,6 @@ GENERICOBJS= \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
   ..\generic\$D\textdlgg.obj \
-  ..\generic\$D\extdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\busyinfo.obj
 
@@ -92,6 +104,25 @@ GENERICOBJS= \
 #  ..\generic\$D\listctrl.obj \
 #  ..\generic\$D\notebook.obj \
 
+GENLIBOBJS= \
+  caret.obj \
+  choicdgg.obj \
+  gridg.obj \
+  laywin.obj \
+  panelg.obj \
+  progdlgg.obj \
+  prop.obj \
+  propform.obj \
+  proplist.obj \
+  sashwin.obj \
+  scrolwin.obj \
+  splitter.obj \
+  statusbr.obj \
+  tabg.obj \
+  textdlgg.obj \
+  tipdlg.obj \
+  busyinfo.obj
+
 # These are generic things that don't need to be compiled on PM,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= \
@@ -151,7 +182,6 @@ COMMONOBJS = \
   ..\common\$D\string.obj \
   ..\common\$D\socket.obj \
   ..\common\$D\sckaddr.obj \
-  ..\common\$D\sckint.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \
@@ -176,14 +206,244 @@ COMMONOBJS = \
   ..\common\$D\txtstrm.obj \
   ..\common\$D\wxchar.obj \
   ..\common\$D\unzip.obj \
-  ..\common\$D\zipstream.obj \
   ..\common\$D\filesys.obj \
   ..\common\$D\fs_inet.obj \
   ..\common\$D\fs_zip.obj
 
+COMLIBOBJS1 = \
+  cmndata.obj \
+  config.obj \
+  dcbase.obj \
+  db.obj \
+  dbtable.obj \
+  docview.obj \
+  docmdi.obj \
+  dynarray.obj \
+  dynlib.obj \
+  event.obj \
+  file.obj \
+  filefn.obj \
+  fileconf.obj \
+  framecmn.obj \
+  ftp.obj \
+  gdicmn.obj \
+  image.obj \
+  imagbmp.obj \
+  imagjpeg.obj \
+  imagpng.obj \
+  imaggif.obj \
+  intl.obj \
+  ipcbase.obj \
+  helpbase.obj \
+  layout.obj \
+  log.obj \
+  memory.obj \
+  mimetype.obj \
+  module.obj \
+  odbc.obj \
+  object.obj \
+  prntbase.obj \
+  resource.obj \
+  tbarbase.obj \
+  tbarsmpl.obj \
+  textfile.obj \
+  timercmn.obj \
+  utilscmn.obj \
+  validate.obj \
+  valgen.obj \
+  valtext.obj \
+  date.obj \
+  hash.obj \
+  list.obj \
+  paper.obj
+
+COMLIBOBJS2 = \
+  string.obj \
+  socket.obj \
+  sckaddr.obj \
+  sckfile.obj \
+  sckipc.obj \
+  sckstrm.obj \
+  url.obj \
+  http.obj \
+  protocol.obj \
+  time.obj \
+  tokenzr.obj \
+  wxexpr.obj \
+  y_tab.obj \
+  extended.obj \
+  process.obj \
+  wfstream.obj \
+  mstream.obj \
+  zstream.obj \
+  stream.obj \
+  datstrm.obj \
+  objstrm.obj \
+  variant.obj \
+  dlgcmn.obj \
+  wincmn.obj \
+  txtstrm.obj \
+  wxchar.obj \
+  unzip.obj \
+  filesys.obj \
+  fs_inet.obj \
+  fs_zip.obj
 
 OS2OBJS = \
-  ..\os2\$D\window.obj \
+  ..\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\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\gauge.obj \
+  ..\os2\$D\gdiobj.obj \
+  ..\os2\$D\gsocket.obj \
+  ..\os2\$D\helpwin.obj \
+  ..\os2\$D\icon.obj \
+  ..\os2\$D\imaglist.obj \
+  ..\os2\$D\iniconf.obj \
+  ..\os2\$D\joystick.obj \
+  ..\os2\$D\listbox.obj \
+  ..\os2\$D\listctrl.obj \
+  ..\os2\$D\main.obj \
+  ..\os2\$D\mdi.obj \
+  ..\os2\$D\menu.obj \
+  ..\os2\$D\menuitem.obj \
+  ..\os2\$D\metafile.obj \
+  ..\os2\$D\minifram.obj \
+  ..\os2\$D\msgdlg.obj \
+  ..\os2\$D\nativdlg.obj \
+  ..\os2\$D\notebook.obj \
+  ..\os2\$D\ownerdrw.obj \
+  ..\os2\$D\palette.obj \
+  ..\os2\$D\pen.obj \
+  ..\os2\$D\pnghand.obj \
+  ..\os2\$D\print.obj \
+  ..\os2\$D\radiobox.obj \
+  ..\os2\$D\radiobut.obj \
+  ..\os2\$D\region.obj \
+  ..\os2\$D\scrolbar.obj \
+  ..\os2\$D\settings.obj \
+  ..\os2\$D\slider.obj \
+  ..\os2\$D\spinbutt.obj \
+  ..\os2\$D\spinctrl.obj \
+  ..\os2\$D\statbmp.obj \
+  ..\os2\$D\statbox.obj \
+  ..\os2\$D\stattext.obj \
+  ..\os2\$D\statbrpm.obj \
+  ..\os2\$D\tabctrl.obj \
+  ..\os2\$D\taskbar.obj \
+  ..\os2\$D\textctrl.obj \
+  ..\os2\$D\thread.obj \
+  ..\os2\$D\timer.obj \
+  ..\os2\$D\toolbar.obj \
+  ..\os2\$D\tooltip.obj \
+  ..\os2\$D\treectrl.obj \
+  ..\os2\$D\utils.obj \
+  ..\os2\$D\utilsexc.obj \
+  ..\os2\$D\wave.obj \
+  ..\os2\$D\window.obj
+
+OS2LIBOBJS1 = \
+  accel.obj \
+  app.obj \
+  bitmap.obj \
+  bmpbuttn.obj \
+  brush.obj \
+  button.obj \
+  checkbox.obj \
+  checklst.obj \
+  choice.obj \
+  clipbrd.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 \
+  gauge.obj \
+  gdiobj.obj \
+  gsocket.obj \
+  helpwin.obj \
+  icon.obj \
+  imaglist.obj \
+  iniconf.obj \
+  joystick.obj \
+  listbox.obj \
+  listctrl.obj \
+  main.obj \
+  mdi.obj \
+  menu.obj \
+  menuitem.obj \
+  metafile.obj \
+  minifram.obj \
+  msgdlg.obj \
+  nativdlg.obj
+
+OS2LIBOBJS2 = \
+  notebook.obj \
+  ownerdrw.obj \
+  palette.obj \
+  pen.obj \
+  pnghand.obj \
+  print.obj \
+  radiobox.obj \
+  radiobut.obj \
+  region.obj \
+  scrolbar.obj \
+  settings.obj \
+  slider.obj \
+  spinbutt.obj \
+  spinctrl.obj \
+  statbmp.obj \
+  statbox.obj \
+  stattext.obj \
+  statbrpm.obj \
+  tabctrl.obj \
+  taskbar.obj \
+  textctrl.obj \
+  thread.obj \
+  timer.obj \
+  toolbar.obj \
+  tooltip.obj \
+  treectrl.obj \
+  utils.obj \
+  utilsexc.obj \
+  wave.obj \
+  window.obj
 
 HTMLOBJS = \
   ..\html\$D\htmlcell.obj \
@@ -231,6 +491,183 @@ $(GENDIR)\$D:
 $(HTMLDIR)\$D:
     md $(HTMLDIR)\$D
 
+$(COMLIBOBJS1):
+  copy ..\common\$D\cmndata.obj
+  copy ..\common\$D\config.obj
+  copy ..\common\$D\dcbase.obj
+  copy ..\common\$D\db.obj
+  copy ..\common\$D\dbtable.obj
+  copy ..\common\$D\docview.obj
+  copy ..\common\$D\docmdi.obj
+  copy ..\common\$D\dynarray.obj
+  copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\event.obj
+  copy ..\common\$D\file.obj
+  copy ..\common\$D\filefn.obj
+  copy ..\common\$D\fileconf.obj
+  copy ..\common\$D\framecmn.obj
+  copy ..\common\$D\ftp.obj
+  copy ..\common\$D\gdicmn.obj
+  copy ..\common\$D\image.obj
+  copy ..\common\$D\imagbmp.obj
+  copy ..\common\$D\imagjpeg.obj
+  copy ..\common\$D\imagpng.obj
+  copy ..\common\$D\imaggif.obj
+  copy ..\common\$D\intl.obj
+  copy ..\common\$D\ipcbase.obj
+  copy ..\common\$D\helpbase.obj
+  copy ..\common\$D\layout.obj
+  copy ..\common\$D\log.obj
+  copy ..\common\$D\memory.obj
+  copy ..\common\$D\mimetype.obj
+  copy ..\common\$D\module.obj
+  copy ..\common\$D\odbc.obj
+  copy ..\common\$D\object.obj
+  copy ..\common\$D\prntbase.obj
+  copy ..\common\$D\resource.obj
+  copy ..\common\$D\tbarbase.obj
+  copy ..\common\$D\tbarsmpl.obj
+  copy ..\common\$D\textfile.obj
+  copy ..\common\$D\timercmn.obj
+  copy ..\common\$D\utilscmn.obj
+  copy ..\common\$D\validate.obj
+  copy ..\common\$D\valgen.obj
+  copy ..\common\$D\valtext.obj
+  copy ..\common\$D\date.obj
+  copy ..\common\$D\hash.obj
+  copy ..\common\$D\list.obj
+  copy ..\common\$D\paper.obj
+
+$(COMLIBOBJS2):
+  copy ..\common\$D\string.obj
+  copy ..\common\$D\socket.obj
+  copy ..\common\$D\sckaddr.obj
+  copy ..\common\$D\sckfile.obj
+  copy ..\common\$D\sckipc.obj
+  copy ..\common\$D\sckstrm.obj
+  copy ..\common\$D\url.obj
+  copy ..\common\$D\http.obj
+  copy ..\common\$D\protocol.obj
+  copy ..\common\$D\time.obj
+  copy ..\common\$D\tokenzr.obj
+  copy ..\common\$D\wxexpr.obj
+  copy ..\common\$D\y_tab.obj
+  copy ..\common\$D\extended.obj
+  copy ..\common\$D\process.obj
+  copy ..\common\$D\wfstream.obj
+  copy ..\common\$D\mstream.obj
+  copy ..\common\$D\zstream.obj
+  copy ..\common\$D\stream.obj
+  copy ..\common\$D\datstrm.obj
+  copy ..\common\$D\objstrm.obj
+  copy ..\common\$D\variant.obj
+  copy ..\common\$D\dlgcmn.obj
+  copy ..\common\$D\wincmn.obj
+  copy ..\common\$D\txtstrm.obj
+  copy ..\common\$D\wxchar.obj
+  copy ..\common\$D\unzip.obj
+  copy ..\common\$D\filesys.obj
+  copy ..\common\$D\fs_inet.obj
+  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
+  copy ..\generic\$D\panelg.obj
+  copy ..\generic\$D\progdlgg.obj
+  copy ..\generic\$D\prop.obj
+  copy ..\generic\$D\propform.obj
+  copy ..\generic\$D\proplist.obj
+  copy ..\generic\$D\sashwin.obj
+  copy ..\generic\$D\scrolwin.obj
+  copy ..\generic\$D\splitter.obj
+  copy ..\generic\$D\statusbr.obj
+  copy ..\generic\$D\tabg.obj
+  copy ..\generic\$D\textdlgg.obj
+  copy ..\generic\$D\tipdlg.obj
+  copy ..\generic\$D\busyinfo.obj
+
+$(OS2LIBOBJS1):
+  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\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\gauge.obj
+  copy ..\os2\$D\gdiobj.obj
+  copy ..\os2\$D\gsocket.obj
+  copy ..\os2\$D\helpwin.obj
+  copy ..\os2\$D\icon.obj
+  copy ..\os2\$D\imaglist.obj
+  copy ..\os2\$D\iniconf.obj
+  copy ..\os2\$D\joystick.obj
+  copy ..\os2\$D\listbox.obj
+  copy ..\os2\$D\listctrl.obj
+  copy ..\os2\$D\main.obj
+  copy ..\os2\$D\mdi.obj
+  copy ..\os2\$D\menu.obj
+  copy ..\os2\$D\menuitem.obj
+  copy ..\os2\$D\metafile.obj
+  copy ..\os2\$D\minifram.obj
+  copy ..\os2\$D\msgdlg.obj
+  copy ..\os2\$D\nativdlg.obj
+
+$(OS2LIBOBJS2):
+  copy ..\os2\$D\notebook.obj
+  copy ..\os2\$D\ownerdrw.obj
+  copy ..\os2\$D\palette.obj
+  copy ..\os2\$D\pen.obj
+  copy ..\os2\$D\pnghand.obj
+  copy ..\os2\$D\print.obj
+  copy ..\os2\$D\radiobox.obj
+  copy ..\os2\$D\radiobut.obj
+  copy ..\os2\$D\region.obj
+  copy ..\os2\$D\scrolbar.obj
+  copy ..\os2\$D\settings.obj
+  copy ..\os2\$D\slider.obj
+  copy ..\os2\$D\spinbutt.obj
+  copy ..\os2\$D\spinctrl.obj
+  copy ..\os2\$D\statbmp.obj
+  copy ..\os2\$D\statbox.obj
+  copy ..\os2\$D\stattext.obj
+  copy ..\os2\$D\statbrpm.obj
+  copy ..\os2\$D\tabctrl.obj
+  copy ..\os2\$D\taskbar.obj
+  copy ..\os2\$D\textctrl.obj
+  copy ..\os2\$D\thread.obj
+  copy ..\os2\$D\timer.obj
+  copy ..\os2\$D\toolbar.obj
+  copy ..\os2\$D\tooltip.obj
+  copy ..\os2\$D\treectrl.obj
+  copy ..\os2\$D\utils.obj
+  copy ..\os2\$D\utilsexc.obj
+  copy ..\os2\$D\wave.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)
@@ -266,12 +703,69 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
-$(WXDIR)\lib\wx.lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+$(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1)
+ 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
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
+$(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
+ touch $(WXDIR)\lib\wxgen.lib
+ del $(WXDIR)\lib\wxgen.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
+$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
+ 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
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
+$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
+ touch $(WXDIR)\lib\wxos22.lib
+ del $(WXDIR)\lib\wxos22.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+ del *.obj
+
+$(WXDIR)\lib\wx.lib: \
+  $D\dummy.obj \
+  $(COMTEMPTGT1) \
+  $(COMTEMPTGT2) \
+  $(GENTEMPTGT) \
+  $(NONESTEMPTGT) \
+  $(OS2TEMPTGT1) \
+  $(OS2TEMPTGT2) \
+  $(PERIPH_LIBS)
  touch $(LIBTARGET)
  del $(LIBTARGET)
- ilib $(LINKFLAGS) $@ @<<
-    $**
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
 <<
+  del $(COMTEMPTGT1)
+  del $(COMTEMPTGT2)
+  del $(GENTEMPTGT)
+  del $(NONESTEMPTGT)
+  del $(OS2TEMPTGT1)
+  del $(OS2TEMPTGT2)
 
 !else