X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/586235b181b5b9fd172339dd7f42a2791df4f158..1828600933a1c9bb4b81d10225bd15e1d505c21f:/build/bakefiles/common_samples_intree.bkl?ds=sidebyside

diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl
index ee8d43a906..c845ef282c 100644
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 
 <makefile>
 
@@ -9,13 +8,7 @@
     <!--                    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>
@@ -28,7 +21,6 @@
 
     <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
@@ -45,7 +37,9 @@
 
         <!-- 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>
 
@@ -58,13 +52,11 @@
         <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>
-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
         </if>
     </template>