small bug fix for composite options

[wxWidgets.git] / src / wxOS2.icc

diff --git a/src/wxOS2.icc b/src/wxOS2.icc
index 3c74d93e6dd49f512b626837e950b06f4c938e11..81506eb4daa641c8035cccc9ad776c8bd7a0488f 100644 (file)
--- a/src/wxOS2.icc
+++ b/src/wxOS2.icc
@@ -1,11 +1,12 @@
-option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trailingenumcommas, "no"),
-                        link(debug, "yes"), link(defaultlibs, "no"), link(version, 2, 11), opt(inline, "yes"), opt(tune, "pentium2"),
-                        define("__WXPM__", ), define("__VISAGECPP__", ),
-                        incl(searchpath, "..\\src\\png"),
-                        incl(searchpath, "..\\src\\jpeg"),
-                        incl(searchpath, "..\\src\\xpm"),
-                        incl(searchpath, "..\\src\\zlib"),
-                        incl(searchpath, "..\\Include")
+option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfuncs, "no"), lang(allowtypedefasclassname, "yes"),
+                        opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), incl(searchpath, "..\\src\\png"), incl(searchpath, "..\\src\\jpeg"),
+                        lang(templatedefimpls, "dontparse"), lang(compatmath, "yes"),
+                        lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "export"), lang(nokeyword, "false"),
+                        lang(nokeyword, "mutable"),
+                        lang(nokeyword, "true"), lang(nokeyword, "typename"),
+                        lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
+                        link(linkwithsharedlib, "yes"), link(defaultlibs, "no"), link(extdictionary, "no"), opt(inline, "yes"),
+                        incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\Include"), macros(redefine, "yes")
 {
    target type("lib") "..\\LIB\\wxOS2.lib"
    {
@@ -36,6 +37,8 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "OS2\\FILEDLG.CPP"
       source "OS2\\FONT.CPP"
       source "OS2\\FONTDLG.CPP"
+      source "OS2\\FONTENUM.CPP"
+      source "OS2\\FONTUTIL.CPP"
       source "OS2\\FRAME.CPP"
       source "OS2\\GAUGE.CPP"
       source "OS2\\GDIIMAGE.CPP"