From: David Webster Date: Wed, 22 Dec 1999 23:21:47 +0000 (+0000) Subject: Update options to the config files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/73c0666118cafeba6676437e817b6d5f9d6e4357 Update options to the config files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/wxCommon.icc b/src/wxCommon.icc index 7671140dd8..e0bfb46492 100644 --- a/src/wxCommon.icc +++ b/src/wxCommon.icc @@ -1,12 +1,15 @@ -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"), gen(debug, "yes"), - file(genobject, "..\\src\\common\\dbgos240\\"), - file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"), - info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"), - info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"), - info(use, "yes") +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"), + gen(debug, "yes"), file(genobject, "..\\SRC\\COMMON\\DBGOS240\\"), file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), + info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"), info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), + info(ini, "yes"), info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"), info(use, "yes") { perform { @@ -21,7 +24,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail 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\\dcbase.cpp" @@ -93,7 +95,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail 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\\txtstrm.cpp" diff --git a/src/wxGeneric.icc b/src/wxGeneric.icc index 244da848fe..caa0b1fafa 100644 --- a/src/wxGeneric.icc +++ b/src/wxGeneric.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\\wxGeneric.lib" { diff --git a/src/wxHTML.icc b/src/wxHTML.icc index e34a28033f..3f15d752df 100644 --- a/src/wxHTML.icc +++ b/src/wxHTML.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\\wxHtml.lib" { diff --git a/src/wxOS2.icc b/src/wxOS2.icc index 3c74d93e6d..4d7ccd252c 100644 --- 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" { diff --git a/src/wxWin.icc b/src/wxWin.icc index e0441d2eca..b3605290dc 100644 --- a/src/wxWin.icc +++ b/src/wxWin.icc @@ -1,7 +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"), gen(debug, "yes"), +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"), file(genobject, "..\\src\\common\\dbgos240\\"), file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"), info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"), @@ -90,7 +95,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail source "COMMON\\stream.cpp" source "COMMON\\string.cpp" source "COMMON\\tbarbase.cpp" - source "COMMON\\tbarsmpl.cpp" source "COMMON\\textcmn.cpp" source "COMMON\\textfile.cpp" source "COMMON\\time.cpp"