]> git.saurik.com Git - wxWidgets.git/blobdiff - src/wxGeneric.icc
small bug fix for composite options
[wxWidgets.git] / src / wxGeneric.icc
index 244da848fe8ffc611daee94b8e98b9b28a920a6d..4c964522717543bfda8550fc35f70a2357eed381 100644 (file)
@@ -1,15 +1,17 @@
-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\\wxGeneric.lib"
    {
       source "GENERIC\\busyinfo.cpp"
+      source "GENERIC\\calctrl.cpp"
       source "GENERIC\\caret.cpp"
       source "GENERIC\\choicdgg.cpp"
       source "GENERIC\\colrdlgg.cpp"