move wxIsDragResultOk out of line to avoid problems with DLL-exported inline function...

[wxWidgets.git] / samples / minimal / Minimal.icc

diff --git a/samples/minimal/Minimal.icc b/samples/minimal/Minimal.icc
index 23464f9e11c9dacf789278ec1265bad7d442c07c..f3c9428eded26b069ee02eb1aa2c8fa8b867ba59 100644 (file)
--- a/samples/minimal/Minimal.icc
+++ b/samples/minimal/Minimal.icc
@@ -2,17 +2,16 @@ option ProjectOptions = gen(arch, "pentium2"), gen(manglelinkagekeywordonlyfuncs
                         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")
+                        link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(defaultlibsname, "..\\..\\LIB\\wx40.lib"), 
+                        link(defaultlibsname, "..\\..\\LIB\\os2png.lib"), link(defaultlibsname, "..\\..\\LIB\\os2zlib.lib"), 
+                        link(defaultlibsname, "NETAPI32.LIB"), link(defaultlibsname, "UPM32.LIB"), link(defaultlibsname, "..\\..\\LIB\\dummy.obj"), 
+                        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"
    }
 }