compilation fix for last fix

[wxWidgets.git] / src / Wxwindll.icc

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index 9474d9d524be31577717aecac6edb25a6e5d70e0..21a2eebb0f43aef0c902a9420a66a91d1595e93b 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -9,7 +9,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
                         link(defaultlibsname, "..\\lib\\os2xpm.lib"),
                         link(defaultlibsname, "..\\lib\\os2jpeg.lib"),
                         link(defaultlibsname, "..\\lib\\os2zlib.lib"),
                         link(defaultlibsname, "..\\lib\\os2xpm.lib"),
                         link(defaultlibsname, "..\\lib\\os2jpeg.lib"),
                         link(defaultlibsname, "..\\lib\\os2zlib.lib"),

-                        link(defaultlibsname, "..\\lib\\os2tifd.lib"),
+                        link(defaultlibsname, "..\\lib\\os2tiff.lib"),

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


@@ -32,11 +32,14 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
    {
        run before '-mkdir ' '..\\src\\common\\dbgos240dll'
        run before '-mkdir ' '..\\samples\\minimal\\dbgos240dll'
    {
        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"


@@ -47,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")


@@ -63,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"


@@ -86,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"


@@ -120,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")
       {


@@ -147,9 +155,11 @@ 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"

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

       source type(cpp) "GENERIC\\GRIDSEL.CPP"
       source type(cpp) "GENERIC\\HELPEXT.CPP"
       source type(cpp) "GENERIC\\HELPHTML.CPP"
       source type(cpp) "GENERIC\\GRIDSEL.CPP"
       source type(cpp) "GENERIC\\HELPEXT.CPP"
       source type(cpp) "GENERIC\\HELPHTML.CPP"


@@ -161,7 +171,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"


@@ -176,7 +185,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"


@@ -221,6 +231,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"


@@ -237,6 +248,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"


@@ -255,7 +270,6 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "OS2\\OWNERDRW.CPP"
       source type(cpp) "OS2\\PALETTE.CPP"
       source type(cpp) "OS2\\PEN.CPP"
       source type(cpp) "OS2\\OWNERDRW.CPP"
       source type(cpp) "OS2\\PALETTE.CPP"
       source type(cpp) "OS2\\PEN.CPP"

-      source type(cpp) "OS2\\PNGHAND.CPP"

       source type(cpp) "OS2\\PRINT.CPP"
       source type(cpp) "OS2\\RADIOBOX.CPP"
       source type(cpp) "OS2\\RADIOBUT.CPP"
       source type(cpp) "OS2\\PRINT.CPP"
       source type(cpp) "OS2\\RADIOBOX.CPP"
       source type(cpp) "OS2\\RADIOBUT.CPP"


@@ -280,10 +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"
+//   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\\MINIMAL\\MINIMAL.CPP"
-      source type(rc) "..\\SAMPLES\\MINIMAL\\MINIMAL.RCO"
+      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"
+//   }

 }
 }