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

diff --git a/samples/minimal/Minimal.icc b/samples/minimal/Minimal.icc
index 23464f9e11c9dacf789278ec1265bad7d442c07c..21a29d4475a5ac4875de22a0554aefc3bb567979 100644 (file)
--- a/samples/minimal/Minimal.icc
+++ b/samples/minimal/Minimal.icc
@@ -1,18 +1,15 @@
-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(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"), lang(templatedefimpls, "dontparse"), 
-                        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"), 
-                        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"), 
+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(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"), lang(templatedefimpls, "dontparse"),
+                        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"),
+                        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"), macros(redefine, "yes")
 {
    target "Minimal.exe"
    {
       source type(cpp) "MINIMAL.CPP"
-      option res_rc_options("-d __VISAGECPP__ -i ..\\..\\Include")
-      {
-         source type(rc) "MINIMAL.RC"
-      }
+      source type(rc) "MINIMAL.RCO"
    }
 }

diff --git a/samples/minimal/minimal.rc b/samples/minimal/minimal.rc
index 53da8824dd943e949bca95485abc2d6daeb9e7b9..3bf71d6da09b4d83a72cbcfe0af26afe57e3becc 100644 (file)
--- a/samples/minimal/minimal.rc
+++ b/samples/minimal/minimal.rc
@@ -1,10 +1,5 @@
-#if defined(__VISAGECPP__)
-ICON     1   PRELOAD   "mondros2.ico"
-#include "wx/os2/wx.rc"
-#else
 mondrian ICON "mondrian.ico"
 #include "wx/msw/wx.rc"
-#endif
 
 #define MINIMAL_QUIT   1
 #define MINIMAL_ABOUT  102