X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4574209d7a5a8f4875d0dd459fec958cb7f7a29e..a2234452a7af149ed9e93aae537eb7a4a6ad356f:/build/bakefiles/common_samples.bkl

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index d12dd210b4..0633b53fe4 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -1,17 +1,19 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <include file="common.bkl"/>
-
+    <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
+                Carbon.r sample.r
             </if>
         </set>
     </if>
@@ -20,23 +22,53 @@
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     
-    <template id="wx_sample_b" template="wx">
+    <template id="wx_util_b" template="wx">
         <include>$(SRCDIR)</include>
-        <!-- Always link against the wxWin library in monolithic build: -->
-        <sys-lib>$(WXLIB_MONO)</sys-lib>
-        <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>
+        <!-- resource files includes: -->
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
+        <!-- this include is not added via <include> for autoconf, see
+             common.bkl: -->
+        <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_sample_console" template="wx_sample_b">
+    <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:              -->
@@ -48,11 +80,44 @@
             <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>
+    
+    
+    <!-- =============================================================== -->
+    <!--                    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>