X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f9e358229504707317256e0bae30211ce3b789e..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/build/bakefiles/common_samples_intree.bkl

diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl
index 6b9b66cb58..9de319fc22 100644
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -4,31 +4,24 @@
 <makefile>
 
     <include file="common.bkl"/>
-    
+
     <!-- =============================================================== -->
     <!--                    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>
-    
+
     <template id="wx_util_b" template="wx">
         <include>$(SRCDIR)</include>
         <define>$(DLLFLAG)</define>
     </template>
-    
+
     <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
@@ -37,7 +30,7 @@
             <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'">
             <wx-os2-lib-resource/>
@@ -45,57 +38,67 @@
 
         <!-- 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>
-    
+
     <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">
         <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>
-    
-    
+
+
     <!-- =============================================================== -->
     <!--                    Support for samples data files:              -->
     <!-- =============================================================== -->
 
-    <define-rule name="wx-data" extends="copy-files">
-        <template>
-            <dependency-of>all</dependency-of>
-            <dstdir>$(BUILDDIR)</dstdir>
-            <srcdir>$(SRCDIR)</srcdir>
-        </template>
+    <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
+        <define-rule name="wx-data" extends="copy-files">
+            <template>
+                <dependency-of>all</dependency-of>
+                <dstdir>$(BUILDDIR)</dstdir>
+                <srcdir>$(SRCDIR)</srcdir>
+            </template>
+
+            <!--
+            VS - FIXME:
+            Don't clean the files because it would wipe out sources files if
+            BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
+            but it would be better to delete the files during "make clean" if
+            BUILDDIR!=SRCDIR.
+
+            <define-tag name="files">
+                <clean-files>
+                    $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
+                </clean-files>
+            </define-tag>
+            -->
+        </define-rule>
+    </if>
+    <if cond="FORMAT_SUPPORTS_ACTIONS=='0'">
+        <!-- empty stub for project-files formats which don't support <command> -->
+        <define-rule name="wx-data" extends="action">
+            <define-tag name="dstdir"/>
+            <define-tag name="srcdir"/>
+            <define-tag name="files"/>
+        </define-rule>
+    </if>
+
 
-        <!--
-        VS - FIXME:
-        Don't clean the files because it would wipe out sources files if
-        BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
-        but it would be better to delete the files during "make clean" if
-        BUILDDIR!=SRCDIR.
-        
-        <define-tag name="files">
-            <clean-files>
-                $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
-            </clean-files>
-        </define-tag>
-        -->
-    </define-rule>
-    
-    
     <!-- =============================================================== -->
     <!--                    Misc platform specialities:                  -->
     <!-- =============================================================== -->
@@ -108,7 +111,7 @@
         compiling it from .rc file (gcc on OS/2 doesn't ship with resource
         compiler):
         -->
-        <define-tag name="wx-os2-lib-resource" rules="exe">        
+        <define-tag name="wx-os2-lib-resource" rules="exe">
             <set var="os2_lib_res">
                 <if cond="PLATFORM_OS2=='1'">
                     $(TOP_SRCDIR)include/wx/os2/wx.res
@@ -117,5 +120,5 @@
             <set var="__objects" append="1">$(os2_lib_res)</set>
         </define-tag>
     </if>
-    
+
 </makefile>