fixed samples compilation when using configure and mingw (missing include for windres)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 6b1038d6f7607949336bfd681ea94b481502bc0f..21e13cf652f61adfb042bf5f422eebe9f95f60a0 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -2,6 +2,8 @@
 <!-- $Id$ -->
 
 <makefile>
+
+    <requires version="0.1.3"/>
     
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 1679475e87373885518ad2b5f4bff9d2079c3b81..cb8b32b214e59236e0fce74b41c0a5c669bf4547 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -30,7 +30,14 @@
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
-        <include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files -->
+        <!-- resource files includes: -->
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
+        <!-- this include is not added via <include> for autoconf, see
+             common.bkl: -->
+        <res-include cond="FORMAT=='autoconf'">
+            $(TOP_SRCDIR)include
+        </res-include>
+        
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
         <if cond="FORMAT=='autoconf'">
             <wx-os2-lib-resource/>