Lots of OS/2 Updates mirroring msw updates

[wxWidgets.git] / src / Wxwindll.icc

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index 863beb0467c0a04c91900456b8c3703b4e1837b5..ffe527a53869f2db4038cf3252c5a36630816852 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -5,13 +5,16 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
                         lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"),
                         link(debug, "yes"), link(linkwithmultithreadlib, "yes"), link(exportAll, "yes"),
                         link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(extdictionary, "no"),
                         lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"),
                         link(debug, "yes"), link(linkwithmultithreadlib, "yes"), link(exportAll, "yes"),
                         link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(extdictionary, "no"),

-                        link(defaultlibsname, "..\\lib\\png.lib"),
-                        link(defaultlibsname, "..\\lib\\xpm.lib"),
-                        link(defaultlibsname, "..\\lib\\jpeg.lib"),
-                        link(defaultlibsname, "..\\lib\\zlib.lib"),
-                        link(defaultlibsname, "..\\lib\\tiff.lib"),
+                        link(defaultlibsname, "..\\lib\\os2png.lib"),
+                        link(defaultlibsname, "..\\lib\\os2xpm.lib"),
+                        link(defaultlibsname, "..\\lib\\os2jpeg.lib"),
+                        link(defaultlibsname, "..\\lib\\os2zlib.lib"),
+                        link(defaultlibsname, "..\\lib\\os2tiff.lib"),

                         link(defaultlibsname, "NETAPI32.LIB"),
                         link(defaultlibsname, "UPM32.LIB"),
                         link(defaultlibsname, "NETAPI32.LIB"),
                         link(defaultlibsname, "UPM32.LIB"),

+                        link(defaultlibsname, "TCP32DLL.LIB"),
+                        link(defaultlibsname, "SO32DLL.LIB"),
+                        link(defaultlibsname, "TCPIP32.LIB"),

                         link(defaultlibsname, "..\\..\\LIB\\dummy.obj"),
                         link(extdictionary, "no"),link(pmtype, "pm"),
                         define("__VISAGECPP__", ), define("__WXPM__", ),
                         link(defaultlibsname, "..\\..\\LIB\\dummy.obj"),
                         link(extdictionary, "no"),link(pmtype, "pm"),
                         define("__VISAGECPP__", ), define("__WXPM__", ),


@@ -19,15 +22,24 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
                         incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\src\\tiff"),
                         incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\png"),
                         macros(redefine, "yes"),
                         incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\src\\tiff"),
                         incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\png"),
                         macros(redefine, "yes"),

+                        file(genobject, "..\\src\\common\\dbgos240dll\\"),

                         file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"),
                         info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"),
                         info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"),
                         info(use, "yes")
 {
                         file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"),
                         info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"),
                         info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"),
                         info(use, "yes")
 {

+   perform
+   {
+       run before '-mkdir ' '..\\src\\common\\dbgos240dll'
+       run before '-mkdir ' '..\\samples\\minimal\\dbgos240dll'
+       run before 'copy ' '..\\src\common\\dosyacc.c ' '..\\src\\common\\y_tab.c'
+       run before 'copy ' '..\\src\common\\doslex.c ' '..\\src\\common\\lex_yy.c'
+   }

    target type("dll") "..\\lib\\Wxwindll.dll"
    {
       source type(cpp) "COMMON\\APPCMN.CPP"
       source type(cpp) "COMMON\\CHOICCMN.CPP"
    target type("dll") "..\\lib\\Wxwindll.dll"
    {
       source type(cpp) "COMMON\\APPCMN.CPP"
       source type(cpp) "COMMON\\CHOICCMN.CPP"

+      source type(cpp) "COMMON\\CSHELP.CPP"

       source type(cpp) "COMMON\\CLIPCMN.CPP"
       source type(cpp) "COMMON\\CMDLINE.CPP"
       source type(cpp) "COMMON\\CMNDATA.CPP"
       source type(cpp) "COMMON\\CLIPCMN.CPP"
       source type(cpp) "COMMON\\CMDLINE.CPP"
       source type(cpp) "COMMON\\CMNDATA.CPP"


@@ -38,12 +50,14 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\DATSTRM.CPP"
       source type(cpp) "COMMON\\DCBASE.CPP"
       source type(cpp) "COMMON\\DLGCMN.CPP"
       source type(cpp) "COMMON\\DATSTRM.CPP"
       source type(cpp) "COMMON\\DCBASE.CPP"
       source type(cpp) "COMMON\\DLGCMN.CPP"

+      source type(cpp) "COMMON\\DIRCMN.CPP"

       source type(cpp) "COMMON\\DNDCMN.CPP"
       source type(cpp) "COMMON\\DOBJCMN.CPP"
       source type(cpp) "COMMON\\DOCMDI.CPP"
       source type(cpp) "COMMON\\DOCVIEW.CPP"
       source type(cpp) "COMMON\\DYNARRAY.CPP"
       source type(cpp) "COMMON\\DYNLIB.CPP"
       source type(cpp) "COMMON\\DNDCMN.CPP"
       source type(cpp) "COMMON\\DOBJCMN.CPP"
       source type(cpp) "COMMON\\DOCMDI.CPP"
       source type(cpp) "COMMON\\DOCVIEW.CPP"
       source type(cpp) "COMMON\\DYNARRAY.CPP"
       source type(cpp) "COMMON\\DYNLIB.CPP"

+      source type(cpp) "COMMON\\EFFECTS.CPP"

       source type(cpp) "COMMON\\ENCCONV.CPP"
       source type(cpp) "COMMON\\EVENT.CPP"
       option report(level, "W")
       source type(cpp) "COMMON\\ENCCONV.CPP"
       source type(cpp) "COMMON\\EVENT.CPP"
       option report(level, "W")


@@ -54,6 +68,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\FILE.CPP"
       source type(cpp) "COMMON\\FILECONF.CPP"
       source type(cpp) "COMMON\\FILEFN.CPP"
       source type(cpp) "COMMON\\FILE.CPP"
       source type(cpp) "COMMON\\FILECONF.CPP"
       source type(cpp) "COMMON\\FILEFN.CPP"

+      source type(cpp) "COMMON\\FILENAME.CPP"

       source type(cpp) "COMMON\\FILESYS.CPP"
       source type(cpp) "COMMON\\FONTCMN.CPP"
       source type(cpp) "COMMON\\FONTMAP.CPP"
       source type(cpp) "COMMON\\FILESYS.CPP"
       source type(cpp) "COMMON\\FONTCMN.CPP"
       source type(cpp) "COMMON\\FONTMAP.CPP"


@@ -77,6 +92,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\IMAGPNG.CPP"
       source type(cpp) "COMMON\\IMAGPNM.CPP"
       source type(cpp) "COMMON\\IMAGTIFF.CPP"
       source type(cpp) "COMMON\\IMAGPNG.CPP"
       source type(cpp) "COMMON\\IMAGPNM.CPP"
       source type(cpp) "COMMON\\IMAGTIFF.CPP"

+      source type(cpp) "COMMON\\IMAGXPM.CPP"

       source type(cpp) "COMMON\\INTL.CPP"
       source type(cpp) "COMMON\\IPCBASE.CPP"
       source type(cpp) "COMMON\\LAYOUT.CPP"
       source type(cpp) "COMMON\\INTL.CPP"
       source type(cpp) "COMMON\\IPCBASE.CPP"
       source type(cpp) "COMMON\\LAYOUT.CPP"


@@ -111,6 +127,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\TEXTFILE.CPP"
       source type(cpp) "COMMON\\TIMERCMN.CPP"
       source type(cpp) "COMMON\\TOKENZR.CPP"
       source type(cpp) "COMMON\\TEXTFILE.CPP"
       source type(cpp) "COMMON\\TIMERCMN.CPP"
       source type(cpp) "COMMON\\TOKENZR.CPP"

+      source type(cpp) "COMMON\\TREEBASE.CPP"

       source type(cpp) "COMMON\\TXTSTRM.CPP"
       option report(level, "E")
       {
       source type(cpp) "COMMON\\TXTSTRM.CPP"
       option report(level, "E")
       {


@@ -138,6 +155,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\CHOICDGG.CPP"
       source type(cpp) "GENERIC\\COLRDLGG.CPP"
       source type(cpp) "GENERIC\\DCPSG.CPP"
       source type(cpp) "GENERIC\\CHOICDGG.CPP"
       source type(cpp) "GENERIC\\COLRDLGG.CPP"
       source type(cpp) "GENERIC\\DCPSG.CPP"

+      source type(cpp) "GENERIC\\DIRCTRLG.CPP"

       source type(cpp) "GENERIC\\DRAGIMGG.CPP"
       source type(cpp) "GENERIC\\FONTDLGG.CPP"
       source type(cpp) "GENERIC\\GRID.CPP"
       source type(cpp) "GENERIC\\DRAGIMGG.CPP"
       source type(cpp) "GENERIC\\FONTDLGG.CPP"
       source type(cpp) "GENERIC\\GRID.CPP"


@@ -152,7 +170,6 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\LOGG.CPP"
       source type(cpp) "GENERIC\\NUMDLGG.CPP"
       source type(cpp) "GENERIC\\PANELG.CPP"
       source type(cpp) "GENERIC\\LOGG.CPP"
       source type(cpp) "GENERIC\\NUMDLGG.CPP"
       source type(cpp) "GENERIC\\PANELG.CPP"

-      source type(cpp) "GENERIC\\PLOT.CPP"

       source type(cpp) "GENERIC\\PRINTPS.CPP"
       source type(cpp) "GENERIC\\PRNTDLGG.CPP"
       source type(cpp) "GENERIC\\PROGDLGG.CPP"
       source type(cpp) "GENERIC\\PRINTPS.CPP"
       source type(cpp) "GENERIC\\PRNTDLGG.CPP"
       source type(cpp) "GENERIC\\PROGDLGG.CPP"


@@ -167,7 +184,8 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\TBARSMPL.CPP"
       source type(cpp) "GENERIC\\TEXTDLGG.CPP"
       source type(cpp) "GENERIC\\TIPDLG.CPP"
       source type(cpp) "GENERIC\\TBARSMPL.CPP"
       source type(cpp) "GENERIC\\TEXTDLGG.CPP"
       source type(cpp) "GENERIC\\TIPDLG.CPP"

-      source type(cpp) "GENERIC\\TREECTRL.CPP"
+      source type(cpp) "GENERIC\\TIPWIN.CPP"
+      source type(cpp) "GENERIC\\TREECTLG.CPP"

       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"
       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"


@@ -212,6 +230,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "OS2\\DCPRINT.CPP"
       source type(cpp) "OS2\\DCSCREEN.CPP"
       source type(cpp) "OS2\\DIALOG.CPP"
       source type(cpp) "OS2\\DCPRINT.CPP"
       source type(cpp) "OS2\\DCSCREEN.CPP"
       source type(cpp) "OS2\\DIALOG.CPP"

+      source type(cpp) "OS2\\DIR.CPP"

       source type(cpp) "OS2\\DIRDLG.CPP"
       source type(cpp) "OS2\\DND.CPP"
       source type(cpp) "OS2\\DUMMYDLL.CPP"
       source type(cpp) "OS2\\DIRDLG.CPP"
       source type(cpp) "OS2\\DND.CPP"
       source type(cpp) "OS2\\DUMMYDLL.CPP"


@@ -228,6 +247,10 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       {
          source "OS2\\GSOCKET.C"
       }
       {
          source "OS2\\GSOCKET.C"
       }

+      option report(level, "E")
+      {
+         source "OS2\\GSOCKPM.C"
+      }

       source type(cpp) "OS2\\HELPWIN.CPP"
       source type(cpp) "OS2\\ICON.CPP"
       source type(cpp) "OS2\\INICONF.CPP"
       source type(cpp) "OS2\\HELPWIN.CPP"
       source type(cpp) "OS2\\ICON.CPP"
       source type(cpp) "OS2\\INICONF.CPP"


@@ -271,5 +294,21 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "OS2\\UTILSEXC.CPP"
       source type(cpp) "OS2\\WAVE.CPP"
       source type(cpp) "OS2\\WINDOW.CPP"
       source type(cpp) "OS2\\UTILSEXC.CPP"
       source type(cpp) "OS2\\WAVE.CPP"
       source type(cpp) "OS2\\WINDOW.CPP"

+      source type(cpp) "OS2\\XPMHAND.CPP"
+   }
+//   target "..\\samples\\minimal\\dbgos240dll\\Minimal.exe"
+//   {
+//      source type(cpp) "..\\SAMPLES\\MINIMAL\\MINIMAL.CPP"
+//      source type(rc) "..\\SAMPLES\\MINIMAL\\MINIMAL.RC4"
+//   }
+   target "..\\samples\\menu\\dbgos240dll\\Menu.exe"
+   {
+      source type(cpp) "..\\SAMPLES\\MENU\\MENU.CPP"
+      source type(rc) "..\\SAMPLES\\MENU\\MENU.RC4"

    }
    }

+//   target "..\\samples\\statbar\\dbgos240dll\\Statbar.exe"
+//   {
+//      source type(cpp) "..\\SAMPLES\\STATBAR\\STATBAR.CPP"
+//      source type(rc) "..\\SAMPLES\\STATBAR\\STATBAR.RC4"
+//   }

 }
 }