X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e83a52a25afbf21b0c946d787358527dc1f1c8b3..dbe931ab5e8129e8de3d12ccdb2a207ed235cad6:/build/bakefiles/common_samples.bkl

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 6d9d4aa53c..f9a5e3da58 100644
--- 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'">
-                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
             </if>
         </set>
     </if>
@@ -22,20 +22,35 @@
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     
-    <template id="wx_sample_b" template="wx">
+    <template id="wx_util_b" template="wx">
         <include>$(SRCDIR)</include>
-        <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <define>$(DLLFLAG)</define>
     </template>
     
-    <template id="wx_sample" template="wx_sample_b">
+    <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files -->
+        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
     </template>
     
-    <template id="wx_sample_console" template="wx_sample_b">
+    <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>
     </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>
+        </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>
+        </if>
+    </template>
 
     
     <!-- =============================================================== -->
@@ -64,4 +79,8 @@
         -->
     </define-rule>
 
+    <if cond="FORMAT=='autoconf'">
+        <include file="mac_bundles.bkl"/>
+    </if>
+
 </makefile>