Rebake after adding libs html and xml to samples using lib adv

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 47c4f07dd4ce1b503e0fc6d5eeb3093e284daf12..3e46c6a7c8b29f861037366241f00338a1bce030 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -7,13 +7,13 @@
     <set var="file_common_samples_included">1</set>
     
     <!-- =============================================================== -->
     <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'">
     <!-- =============================================================== -->
 
     <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>
             </if>
         </set>
     </if>


@@ -30,27 +30,44 @@
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     <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 -->
+        <!-- resource files includes: -->
+        <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>
+        

         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
         <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>
     </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'">
     </template>
     
     <template id="wx_sample" template="wx_util">
         <if cond="FORMAT=='autoconf'">

+            <wx-mac-app-bundle/>

             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
             <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>
         </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>
         </if>
     </template>

-
+    

     
     <!-- =============================================================== -->
     <!--                    Support for samples data files:              -->
     
     <!-- =============================================================== -->
     <!--                    Support for samples data files:              -->


@@ -77,5 +94,29 @@
         </define-tag>
         -->
     </define-rule>
         </define-tag>
         -->
     </define-rule>

+    
+    
+    <!-- =============================================================== -->
+    <!--                    Misc platform specialities:                  -->
+    <!-- =============================================================== -->
+
+    <if cond="FORMAT=='autoconf'">
+        <include file="mac_bundles.bkl"/>
+
+        <!--
+        A hack to include precompiled OS/2 resource file in apps instead of
+        compiling it from .rc file (gcc on OS/2 doesn't ship with resource
+        compiler):
+        -->
+        <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
+                </if>
+            </set>
+            <set var="__objects" append="1">$(os2_lib_res)</set>
+        </define-tag>
+    </if>
+    

 
 </makefile>
 
 </makefile>