fixed wrong return value and child creation login in GetWindowChild() (includes patch...

[wxWidgets.git] / build / bakefiles / common_samples.bkl

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index af2928f0b21e109784b63c91c3f6cfffdeed2de4..0633b53fe4af6fbf91e9af3183d4022933694d24 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -13,7 +13,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">

-                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
+                Carbon.r sample.r

             </if>
         </set>
     </if>
             </if>
         </set>
     </if>


@@ -34,9 +34,10 @@
         <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
         <!-- this include is not added via <include> for autoconf, see
              common.bkl: -->
         <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>
+        <if cond="FORMAT=='autoconf'">
+            <res-include>$(RCDEFDIR)</res-include>
+            <res-include>$(TOP_SRCDIR)include</res-include>
+        </if>

         
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
         <if cond="FORMAT=='autoconf'">
         
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
         <if cond="FORMAT=='autoconf'">


@@ -51,6 +52,7 @@
     
     <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>
     
     <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>

+        <define>wxUSE_GUI=0</define>

     </template>
     
     <template id="wx_sample" template="wx_util">
     </template>
     
     <template id="wx_sample" template="wx_util">