MSW compile fixes.

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index ecae366790d3380943e9f2880f29f281df001871..a2deca02f6d8c8d8efda01850eb9a85696abe5e5 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -16,20 +16,27 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
    perform
    {
        run before '-mkdir ' '..\\src\\common\\dbgos240'
+       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("lib") "..\\LIB\\wx40.lib"
    {
       source "COMMON\\appcmn.cpp"
       source "COMMON\\choiccmn.cpp"
       source "COMMON\\clipcmn.cpp"
+      source "COMMON\\cmdline.cpp"
       source "COMMON\\cmndata.cpp"
       source "COMMON\\config.cpp"
       source "COMMON\\ctrlcmn.cpp"
       source "COMMON\\ctrlsub.cpp"
-      source "COMMON\\date.cpp"
+      source "COMMON\\datetime.cpp"
       source "COMMON\\datstrm.cpp"
+      source "COMMON\\db.cpp"
+      source "COMMON\\dbtable.cpp"
       source "COMMON\\dcbase.cpp"
+      source "COMMON\\dircmn.cpp"
       source "COMMON\\dlgcmn.cpp"
+      source "COMMON\\dndcmn.cpp"
       source "COMMON\\dobjcmn.cpp"
       source "COMMON\\docmdi.cpp"
       source "COMMON\\docview.cpp"
@@ -45,14 +52,17 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\file.cpp"
       source "COMMON\\fileconf.cpp"
       source "COMMON\\filefn.cpp"
+      source "COMMON\\filename.cpp"
       source "COMMON\\filesys.cpp"
       source "COMMON\\fontcmn.cpp"
       source "COMMON\\fontmap.cpp"
       source "COMMON\\framecmn.cpp"
       source "COMMON\\fs_inet.cpp"
+      source "COMMON\\fs_mem.cpp"
       source "COMMON\\fs_zip.cpp"
       source "COMMON\\ftp.cpp"
       source "COMMON\\gdicmn.cpp"
+      source "COMMON\\geometry.cpp"
       source "COMMON\\gifdecod.cpp"
       source "COMMON\\hash.cpp"
       source "COMMON\\helpbase.cpp"
@@ -65,7 +75,8 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\imagpcx.cpp"
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
-      source "COMMON\\init.cpp"
+      source "COMMON\\imagtiff.cpp"
+      source "COMMON\\imagxpm.cpp"
       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"
@@ -75,15 +86,17 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\matrix.cpp"
       source "COMMON\\memory.cpp"
       source "COMMON\\menucmn.cpp"
-      source "COMMON\\mimetype.cpp"
+      source "COMMON\\mimecmn.cpp"
       source "COMMON\\module.cpp"
       source "COMMON\\mstream.cpp"
       source "COMMON\\object.cpp"
       source "COMMON\\objstrm.cpp"
+      source "COMMON\\odbc.cpp"
       source "COMMON\\paper.cpp"
       source "COMMON\\prntbase.cpp"
       source "COMMON\\process.cpp"
       source "COMMON\\protocol.cpp"
+      source "COMMON\\quantize.cpp"
       source "COMMON\\resource.cpp"
       source "COMMON\\sckaddr.cpp"
       source "COMMON\\sckfile.cpp"
@@ -98,9 +111,9 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\tbarbase.cpp"
       source "COMMON\\textcmn.cpp"
       source "COMMON\\textfile.cpp"
-      source "COMMON\\time.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"
+      source "COMMON\\treelist.cpp"
       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {
@@ -122,38 +135,45 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       }
       source "COMMON\\zipstrm.cpp"
       source "COMMON\\zstream.cpp"
-      source "GENERIC\\busyinfo.cpp"
-      source "GENERIC\\caret.cpp"
-      source "GENERIC\\choicdgg.cpp"
-      source "GENERIC\\colrdlgg.cpp"
-      source "GENERIC\\dcpsg.cpp"
-      source "GENERIC\\fontdlgg.cpp"
-      source "GENERIC\\grid.cpp"
-      source "GENERIC\\helpext.cpp"
-      source "GENERIC\\helphtml.cpp"
-      source "GENERIC\\helpwxht.cpp"
-      source "GENERIC\\helpxlp.cpp"
-      source "GENERIC\\imaglist.cpp"
-      source "GENERIC\\laywin.cpp"
-      source "GENERIC\\listctrl.cpp"
-      source "GENERIC\\logg.cpp"
-      source "GENERIC\\msgdlgg.cpp"
-      source "GENERIC\\numdlgg.cpp"
-      source "GENERIC\\panelg.cpp"
-      source "GENERIC\\printps.cpp"
-      source "GENERIC\\prntdlgg.cpp"
-      source "GENERIC\\progdlgg.cpp"
-      source "GENERIC\\prop.cpp"
-      source "GENERIC\\propform.cpp"
-      source "GENERIC\\proplist.cpp"
-      source "GENERIC\\sashwin.cpp"
-      source "GENERIC\\scrolwin.cpp"
-      source "GENERIC\\splitter.cpp"
-      source "GENERIC\\statusbr.cpp"
-      source "GENERIC\\tabg.cpp"
-      source "GENERIC\\textdlgg.cpp"
-      source "GENERIC\\tipdlg.cpp"
-      source "GENERIC\\treectrl.cpp"
+      source "GENERIC\\BUSYINFO.CPP"
+      source "GENERIC\\CALCTRL.CPP"
+      source "GENERIC\\CARET.CPP"
+      source "GENERIC\\CHOICDGG.CPP"
+      source "GENERIC\\COLRDLGG.CPP"
+      source "GENERIC\\DCPSG.CPP"
+      source "GENERIC\\DRAGIMGG.CPP"
+      source "GENERIC\\FONTDLGG.CPP"
+      source "GENERIC\\GRID.CPP"
+      source "GENERIC\\GRIDCTRL.CPP"
+      source "GENERIC\\GRIDSEL.CPP"
+      source "GENERIC\\HELPEXT.CPP"
+      source "GENERIC\\HELPHTML.CPP"
+      source "GENERIC\\HELPWXHT.CPP"
+      source "GENERIC\\HELPXLP.CPP"
+      source "GENERIC\\IMAGLIST.CPP"
+      source "GENERIC\\LAYWIN.CPP"
+      source "GENERIC\\LISTCTRL.CPP"
+      source "GENERIC\\LOGG.CPP"
+      source "GENERIC\\NUMDLGG.CPP"
+      source "GENERIC\\PANELG.CPP"
+      source "GENERIC\\PLOT.CPP"
+      source "GENERIC\\PRINTPS.CPP"
+      source "GENERIC\\PRNTDLGG.CPP"
+      source "GENERIC\\PROGDLGG.CPP"
+      source "GENERIC\\PROP.CPP"
+      source "GENERIC\\PROPFORM.CPP"
+      source "GENERIC\\PROPLIST.CPP"
+      source "GENERIC\\SASHWIN.CPP"
+      source "GENERIC\\SCROLWIN.CPP"
+      source "GENERIC\\SPLITTER.CPP"
+      source "GENERIC\\STATUSBR.CPP"
+      source "GENERIC\\TABG.CPP"
+      source "GENERIC\\TBARSMPL.CPP"
+      source "GENERIC\\TEXTDLGG.CPP"
+      source "GENERIC\\TIPDLG.CPP"
+      source "GENERIC\\TREECTRL.CPP"
+      source "GENERIC\\TREELAY.CPP"
+      source "GENERIC\\WIZARD.CPP"
       source "HTML\\helpctrl.cpp"
       source "HTML\\helpdata.cpp"
       source "HTML\\helpfrm.cpp"
@@ -163,12 +183,14 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "HTML\\htmltag.cpp"
       source "HTML\\htmlwin.cpp"
       source "HTML\\htmprint.cpp"
+      source "HTML\\m_dflist.cpp"
       source "HTML\\m_fonts.cpp"
       source "HTML\\m_hline.cpp"
       source "HTML\\m_image.cpp"
       source "HTML\\m_layout.cpp"
       source "HTML\\m_links.cpp"
       source "HTML\\m_list.cpp"
+      source "HTML\\m_meta.cpp"
       source "HTML\\m_pre.cpp"
       source "HTML\\m_tables.cpp"
       source "HTML\\winpars.cpp"
@@ -207,7 +229,11 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "OS2\\GDIOBJ.CPP"
       option report(level, "E")
       {
-         source "OS2\\GSOCKET.C"
+         source type("c") "OS2\\GSOCKET.C"
+      }
+      option report(level, "E")
+      {
+         source type("c") "OS2\\GSOCKPM.C"
       }
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
@@ -219,6 +245,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "OS2\\MENU.CPP"
       source "OS2\\MENUITEM.CPP"
       source "OS2\\METAFILE.CPP"
+      source "OS2\\MIMETYPE.CPP"
       source "OS2\\MINIFRAM.CPP"
       source "OS2\\MSGDLG.CPP"
       source "OS2\\NATIVDLG.CPP"
@@ -226,7 +253,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "OS2\\OWNERDRW.CPP"
       source "OS2\\PALETTE.CPP"
       source "OS2\\PEN.CPP"
-      source "OS2\\PNGHAND.CPP"
       source "OS2\\PRINT.CPP"
       source "OS2\\RADIOBOX.CPP"
       source "OS2\\RADIOBUT.CPP"