X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670ec357654cdee164e8ade5f6b7852f3108fa26..525b0568c9882692cf31bf4d5a308940154cb350:/build/bakefiles/common_samples.bkl

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index a6eb1e06af..0633b53fe4 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -7,13 +7,13 @@
     <set var="file_common_samples_included">1</set>
     
     <!-- =============================================================== -->
-    <!--                    Template for wxWindows samples:              -->
+    <!--                    Template for wxWidgets samples:              -->
     <!-- =============================================================== -->
 
     <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>
@@ -34,38 +34,40 @@
         <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'">
             <wx-os2-lib-resource/>
         </if>
+
+        <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
+        <if cond="FORMAT!='autoconf'">
+            <define>NOPCH</define>
+        </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>
-            <__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command>
+            <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>
-            <__command>$(SAMPLES_RPATH_POSTLINK)</__command>
+            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
         </if>
     </template>
-
-    <template id="wx_test_console" template="wx_sample_console">
-        <cppflags>$(CPPUNIT_CFLAGS)</cppflags>
-        <ldflags>$(CPPUNIT_LIBS)</ldflags>
-    </template>
     
     
     <!-- =============================================================== -->