Patch [ 688973 ] from William Gallafent: add missing wx/dc.h.

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 003352d9492c633adb0beab413ab977a6eeb862b..f1cda8a892a8892b4c00392d588d57bbb2e26016 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -25,6 +25,7 @@ LIBTARGET=$(WXLIB)
 COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
 COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
 COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib
 COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
 COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
 COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib

+COMTEMPTGT4=$(WXDIR)\lib\wxcom4.lib

 GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
 NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
 OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
 GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
 NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
 OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib


@@ -105,7 +106,6 @@ GENERICOBJS= \
   ..\generic\$D\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \

-  ..\generic\$D\fontdlgg.obj \

   ..\generic\$D\fdrepdlg.obj \
   ..\generic\$D\grid.obj \
   ..\generic\$D\gridctrl.obj \
   ..\generic\$D\fdrepdlg.obj \
   ..\generic\$D\grid.obj \
   ..\generic\$D\gridctrl.obj \


@@ -114,8 +114,8 @@ GENERICOBJS= \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \

-  ..\generic\$D\listctrl.obj \

   ..\generic\$D\logg.obj \
   ..\generic\$D\logg.obj \

+  ..\generic\$D\mdig.obj \

   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
   ..\generic\$D\printps.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
   ..\generic\$D\printps.obj \


@@ -134,7 +134,6 @@ GENERICOBJS= \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\tipwin.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\tipwin.obj \

-  ..\generic\$D\treectlg.obj \

   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 
   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 


@@ -152,7 +151,6 @@ GENLIBOBJS= \
   dirdlgg.obj \
   dirctrlg.obj \
   dragimgg.obj \
   dirdlgg.obj \
   dirctrlg.obj \
   dragimgg.obj \

-  fontdlgg.obj \

   fdrepdlg.obj \
   grid.obj \
   gridctrl.obj \
   fdrepdlg.obj \
   grid.obj \
   gridctrl.obj \


@@ -161,8 +159,8 @@ GENLIBOBJS= \
   helphtml.obj \
   imaglist.obj \
   laywin.obj \
   helphtml.obj \
   imaglist.obj \
   laywin.obj \

-  listctrl.obj \

   logg.obj \
   logg.obj \

+  mdig.obj \

   numdlgg.obj \
   panelg.obj \
   printps.obj \
   numdlgg.obj \
   panelg.obj \
   printps.obj \


@@ -181,7 +179,6 @@ GENLIBOBJS= \
   textdlgg.obj \
   tipdlg.obj \
   tipwin.obj \
   textdlgg.obj \
   tipdlg.obj \
   tipwin.obj \

-  treectlg.obj \

   treelay.obj \
   wizard.obj
 
   treelay.obj \
   wizard.obj
 


@@ -275,6 +272,7 @@ COMMONOBJS = \
   ..\common\$D\menucmn.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\menucmn.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \

+  ..\common\$D\msgout.obj \

   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \


@@ -295,6 +293,7 @@ COMMONOBJS = \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \

+  ..\common\$D\settcmn.obj \

   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
   ..\common\$D\statbar.obj \
   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
   ..\common\$D\statbar.obj \


@@ -411,12 +410,13 @@ COMLIBOBJS2 = \
   menucmn.obj \
   mimecmn.obj \
   module.obj \
   menucmn.obj \
   mimecmn.obj \
   module.obj \

+  msgout.obj \

   mstream.obj \
   nbkbase.obj \
   mstream.obj \
   nbkbase.obj \

-  object.obj \
-  odbc.obj
+  object.obj

 
 COMLIBOBJS3 = \
 
 COMLIBOBJS3 = \

+  odbc.obj \

   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \


@@ -430,6 +430,7 @@ COMLIBOBJS3 = \
   sckfile.obj \
   sckipc.obj \
   sckstrm.obj \
   sckfile.obj \
   sckipc.obj \
   sckstrm.obj \

+  settcmn.obj \

   sizer.obj \
   socket.obj \
   statbar.obj \
   sizer.obj \
   socket.obj \
   statbar.obj \


@@ -457,7 +458,9 @@ COMLIBOBJS3 = \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \

-  xpmdecod.obj \
+  xpmdecod.obj
+
+COMLIBOBJS4 = \

   y_tab.obj \
   zipstrm.obj \
   zstream.obj
   y_tab.obj \
   zipstrm.obj \
   zstream.obj


@@ -503,20 +506,19 @@ OS2OBJS = \
   ..\os2\$D\iniconf.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
   ..\os2\$D\iniconf.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \

+  ..\os2\$D\listctrl.obj \

   ..\os2\$D\main.obj \
   ..\os2\$D\main.obj \

-  ..\os2\$D\mdi.obj \

   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
   ..\os2\$D\mimetype.obj \
   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
   ..\os2\$D\mimetype.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\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\popupwin.obj \

   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \
   ..\os2\$D\radiobut.obj \
   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \
   ..\os2\$D\radiobut.obj \


@@ -538,6 +540,7 @@ OS2OBJS = \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
   ..\os2\$D\toplevel.obj \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
   ..\os2\$D\toplevel.obj \

+  ..\os2\$D\treectrl.obj \

   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \


@@ -584,22 +587,21 @@ OS2LIBOBJS1 = \
   iniconf.obj \
   joystick.obj \
   listbox.obj \
   iniconf.obj \
   joystick.obj \
   listbox.obj \

+  listctrl.obj \

   main.obj \
   main.obj \

-  mdi.obj \

   menu.obj \
   menuitem.obj \
   metafile.obj
 
 OS2LIBOBJS2 = \
   mimetype.obj \
   menu.obj \
   menuitem.obj \
   metafile.obj
 
 OS2LIBOBJS2 = \
   mimetype.obj \

-  minifram.obj \

   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \

-  pnghand.obj \
+  popupwin.obj \

   print.obj \
   radiobox.obj \
   radiobut.obj \
   print.obj \
   radiobox.obj \
   radiobut.obj \


@@ -621,6 +623,7 @@ OS2LIBOBJS2 = \
   toolbar.obj \
   tooltip.obj \
   toplevel.obj \
   toolbar.obj \
   tooltip.obj \
   toplevel.obj \

+  treectrl.obj \

   utils.obj \
   utilsexc.obj \
   wave.obj \
   utils.obj \
   utilsexc.obj \
   wave.obj \


@@ -643,7 +646,6 @@ HTMLOBJS = \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \

-  ..\html\$D\m_meta.obj \

   ..\html\$D\m_pre.obj \
   ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \


@@ -666,7 +668,6 @@ HTMLLIBOBJS = \
   m_layout.obj \
   m_links.obj \
   m_list.obj \
   m_layout.obj \
   m_links.obj \
   m_list.obj \

-  m_meta.obj \

   m_pre.obj \
   m_style.obj \
   m_tables.obj \
   m_pre.obj \
   m_style.obj \
   m_tables.obj \


@@ -781,12 +782,13 @@ $(COMLIBOBJS2):
   copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj

+  copy ..\common\$D\msgout.obj

   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj

-  copy ..\common\$D\odbc.obj

 
 $(COMLIBOBJS3):
 
 $(COMLIBOBJS3):

+  copy ..\common\$D\odbc.obj

   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj


@@ -800,6 +802,7 @@ $(COMLIBOBJS3):
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
   copy ..\common\$D\sckstrm.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
   copy ..\common\$D\sckstrm.obj

+  copy ..\common\$D\settcmn.obj

   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\statbar.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\statbar.obj


@@ -828,6 +831,8 @@ $(COMLIBOBJS3):
   copy ..\common\$D\wxchar.obj
   copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj
   copy ..\common\$D\wxchar.obj
   copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj

+
+$(COMLIBOBJS4):

   copy ..\common\$D\y_tab.obj
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
   copy ..\common\$D\y_tab.obj
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj


@@ -843,7 +848,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj

-  copy ..\generic\$D\fontdlgg.obj

   copy ..\generic\$D\fdrepdlg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\gridctrl.obj
   copy ..\generic\$D\fdrepdlg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\gridctrl.obj


@@ -852,8 +856,8 @@ $(GENLIBOBJS):
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj

-  copy ..\generic\$D\listctrl.obj

   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\logg.obj

+  copy ..\generic\$D\mdig.obj

   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
   copy ..\generic\$D\printps.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
   copy ..\generic\$D\printps.obj


@@ -872,7 +876,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\tipwin.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\tipwin.obj

-  copy ..\generic\$D\treectlg.obj

   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 
   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 


@@ -893,7 +896,6 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj

-  copy ..\html\$D\m_meta.obj

   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj


@@ -940,22 +942,21 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\iniconf.obj
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.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\main.obj

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

   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
 
 $(OS2LIBOBJS2):
   copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
 
 $(OS2LIBOBJS2):
   copy ..\os2\$D\mimetype.obj

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

   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   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\popupwin.obj

   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj
   copy ..\os2\$D\radiobut.obj
   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj
   copy ..\os2\$D\radiobut.obj


@@ -977,6 +978,7 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
   copy ..\os2\$D\toplevel.obj
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
   copy ..\os2\$D\toplevel.obj

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

   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj


@@ -1038,6 +1040,13 @@ $(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
     $**;
 <<
 
     $**;
 <<
 

+$(WXDIR)\lib\wxcom4.lib: $(COMLIBOBJS4)
+ -touch $(WXDIR)\lib\wxcom4.lib
+ -del $(WXDIR)\lib\wxcom4.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+

 $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
  -touch $(WXDIR)\lib\wxgen.lib
  -del $(WXDIR)\lib\wxgen.lib
 $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
  -touch $(WXDIR)\lib\wxgen.lib
  -del $(WXDIR)\lib\wxgen.lib


@@ -1079,6 +1088,7 @@ $(WXDIR)\lib\wx.lib: \
   $(COMTEMPTGT1) \
   $(COMTEMPTGT2) \
   $(COMTEMPTGT3) \
   $(COMTEMPTGT1) \
   $(COMTEMPTGT2) \
   $(COMTEMPTGT3) \

+  $(COMTEMPTGT4) \

   $(GENTEMPTGT) \
   $(HTMLTEMPTGT) \
   $(NONESTEMPTGT) \
   $(GENTEMPTGT) \
   $(HTMLTEMPTGT) \
   $(NONESTEMPTGT) \


@@ -1093,6 +1103,7 @@ $(WXDIR)\lib\wx.lib: \
  del $(COMTEMPTGT1)
  del $(COMTEMPTGT2)
  del $(COMTEMPTGT3)
  del $(COMTEMPTGT1)
  del $(COMTEMPTGT2)
  del $(COMTEMPTGT3)

+ del $(COMTEMPTGT4)

  del $(GENTEMPTGT)
  del $(HTMLTEMPTGT)
  del $(NONESTEMPTGT)
  del $(GENTEMPTGT)
  del $(HTMLTEMPTGT)
  del $(NONESTEMPTGT)


@@ -1102,15 +1113,15 @@ $(WXDIR)\lib\wx.lib: \
 !else
 
 # Update the dynamic link library
 !else
 
 # Update the dynamic link library

-$(WXDIR)\lib\wx23.dll: $(OBJECTS)
+$(WXDIR)\lib\wx25.dll: $(OBJECTS)

     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)

-    $(WXDIR)\src\os2\wx23.def
+    $(WXDIR)\src\os2\wx25.def

 <<
 <<

-    implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
+    implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def

 
 !endif
 
 
 !endif
 


@@ -1189,7 +1200,7 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"

-        erase /N ..\..\lib\wx23.lib
+        erase /N ..\..\lib\wx25.lib

 !endif
         erase /N $(COMMDIR)\y_tab.c
         erase /N $(COMMDIR)\lex_yy.c
 !endif
         erase /N $(COMMDIR)\y_tab.c
         erase /N $(COMMDIR)\lex_yy.c