]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/common_samples.bkl
added displayx11.{cpp,h}
[wxWidgets.git] / build / bakefiles / common_samples.bkl
index 4352f8bcc1b1d7d9a9e7b131630567501d174a6a..f9a5e3da58fdfc1d5f67af4bf2131994c63e9951 100644 (file)
@@ -1,8 +1,10 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <include file="common.bkl"/>
-
+    <set var="file_common_samples_included">1</set>
     
     <!-- =============================================================== -->
     <!--                    Template for wxWindows samples:              -->
@@ -11,7 +13,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
-                Carbon.r ../../lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
             </if>
         </set>
     </if>
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     
-    <template id="wx_sample" 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_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_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>
 
     
             <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 cond="FORMAT=='autoconf'">
+        <include file="mac_bundles.bkl"/>
+    </if>
+
 </makefile>