New Visualage stuff and remove OS/2 stuff in the .rc file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2000-01-26 21:23:28 +00:00
parent 66b6b04535
commit 22224dec5b
2 changed files with 8 additions and 16 deletions

View File

@ -1,18 +1,15 @@
option ProjectOptions = gen(arch, "pentium2"), gen(manglelinkagekeywordonlyfuncs, "no"), lang(longlong, "yes"), lang(allowtypedefasclassname, "yes"), option ProjectOptions = gen(arch, "pentium2"), gen(manglelinkagekeywordonlyfuncs, "no"), lang(longlong, "yes"), lang(allowtypedefasclassname, "yes"),
lang(compatmath, "yes"), lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "export"), lang(nokeyword, "false"), 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(templatedefimpls, "dontparse"), lang(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"), lang(templatedefimpls, "dontparse"),
lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"), lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(defaultlibsname, "..\\..\\LIB\\wx40.lib"), link(extdictionary, "no"), link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(defaultlibsname, "..\\..\\LIB\\wx40.lib"), link(extdictionary, "no"),
opt(inline, "yes"), opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), incl(searchpath, "..\\..\\src\\png"), 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, "..\\..\\src\\jpeg"), incl(searchpath, "..\\..\\src\\xpm"), incl(searchpath, "..\\..\\src\\zlib"),
incl(searchpath, "..\\..\\Include"), macros(redefine, "yes") incl(searchpath, "..\\..\\Include"), macros(redefine, "yes")
{ {
target "Minimal.exe" target "Minimal.exe"
{ {
source type(cpp) "MINIMAL.CPP" source type(cpp) "MINIMAL.CPP"
option res_rc_options("-d __VISAGECPP__ -i ..\\..\\Include") source type(rc) "MINIMAL.RCO"
{
source type(rc) "MINIMAL.RC"
}
} }
} }

View File

@ -1,10 +1,5 @@
#if defined(__VISAGECPP__)
ICON 1 PRELOAD "mondros2.ico"
#include "wx/os2/wx.rc"
#else
mondrian ICON "mondrian.ico" mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
#endif
#define MINIMAL_QUIT 1 #define MINIMAL_QUIT 1
#define MINIMAL_ABOUT 102 #define MINIMAL_ABOUT 102