no_rtti fix was not having correct eval order

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index 2d60341ff14dfae7804c66917da0adee4c58737f..003c5f7c35b311e6902cf64b1771f5eec5ff4874 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -34,6 +34,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\db.cpp"
       source "COMMON\\dbtable.cpp"
       source "COMMON\\dcbase.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\\dlgcmn.cpp"
       source "COMMON\\dndcmn.cpp"
       source "COMMON\\dobjcmn.cpp"


@@ -51,6 +52,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\file.cpp"
       source "COMMON\\fileconf.cpp"
       source "COMMON\\filefn.cpp"
       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\\filesys.cpp"
       source "COMMON\\fontcmn.cpp"
       source "COMMON\\fontmap.cpp"


@@ -74,6 +76,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
       source "COMMON\\imagtiff.cpp"
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
       source "COMMON\\imagtiff.cpp"

+      source "COMMON\\imagxpm.cpp"

       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"
       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"


@@ -93,6 +96,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\prntbase.cpp"
       source "COMMON\\process.cpp"
       source "COMMON\\protocol.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"
       source "COMMON\\resource.cpp"
       source "COMMON\\sckaddr.cpp"
       source "COMMON\\sckfile.cpp"


@@ -109,6 +113,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\textfile.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"
       source "COMMON\\textfile.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"

+      source "COMMON\\treelist.cpp"

       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {
       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {


@@ -139,6 +144,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "GENERIC\\DRAGIMGG.CPP"
       source "GENERIC\\FONTDLGG.CPP"
       source "GENERIC\\GRID.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\\GRIDSEL.CPP"
       source "GENERIC\\HELPEXT.CPP"
       source "GENERIC\\HELPHTML.CPP"


@@ -225,6 +231,10 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       {
          source type("c") "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"
       source "OS2\\INICONF.CPP"
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
       source "OS2\\INICONF.CPP"