Don't assume any particular default size for XRC image lists.

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

diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl
index ee8d43a9067b85da87353dd794bdec89ac02c308..9de319fc22f98b8e1556fd7b78180e80c4e2a9e0 100644 (file)
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -9,13 +9,7 @@
     <!--                    Template for wxWidgets samples:              -->
     <!-- =============================================================== -->
 
     <!--                    Template for wxWidgets samples:              -->
     <!-- =============================================================== -->
 

-    <if cond="FORMAT=='autoconf'">
-        <set var="MACOSX_RESOURCES">
-            <if cond="TOOLKIT=='MAC'">
-                Carbon.r sample.r
-            </if>
-        </set>
-    </if>
+    <set var="WX_ENABLE_PRECOMP_HEADERS">0</set>

 
     <set var="DLLFLAG">
         <if cond="SHARED=='1'">WXUSINGDLL</if>
 
     <set var="DLLFLAG">
         <if cond="SHARED=='1'">WXUSINGDLL</if>


@@ -28,7 +22,6 @@
 
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
 
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>

-        <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>

         <!-- resource files includes: -->
         <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
         <!-- this include is not added via <include> for autoconf, see
         <!-- resource files includes: -->
         <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
         <!-- this include is not added via <include> for autoconf, see


@@ -45,7 +38,9 @@
 
         <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
         <if cond="FORMAT!='autoconf'">
 
         <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
         <if cond="FORMAT!='autoconf'">

-            <define>NOPCH</define>
+            <if cond="WX_ENABLE_PRECOMP_HEADERS=='0'">
+                <define>NOPCH</define>
+            </if>

         </if>
     </template>
 
         </if>
     </template>
 


@@ -58,13 +53,11 @@
         <if cond="FORMAT=='autoconf'">
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <if cond="FORMAT=='autoconf'">
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>

-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>

         </if>
     </template>
     <template id="wx_sample_console" template="wx_util_console">
         <if cond="FORMAT=='autoconf'">
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         </if>
     </template>
     <template id="wx_sample_console" template="wx_util_console">
         <if cond="FORMAT=='autoconf'">
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>

-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>

         </if>
     </template>
 
         </if>
     </template>