Added missing header files

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index d293b934de299badda9c8270f35ec895873b0b81..36e2a27c875f71a10c974b5310aeebf1986e0b90 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -1,10 +1,10 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

+<!-- $Id$ -->
+

 <makefile>
     
 <makefile>
     

-    <set var="BUILDING_LIB">0</set>
-

     <include file="common.bkl"/>
     <include file="common.bkl"/>

-
+    <set var="file_common_samples_included">1</set>

     
     <!-- =============================================================== -->
     <!--                    Template for wxWindows samples:              -->
     
     <!-- =============================================================== -->
     <!--                    Template for wxWindows samples:              -->


@@ -13,19 +13,35 @@
     <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 ../../lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r

             </if>
         </set>
     </if>
             </if>
         </set>
     </if>

+
+    <set var="DLLFLAG">
+        <if cond="SHARED=='1'">WXUSINGDLL</if>
+    </set>

     
     

-    <template id="wx_sample" template="wx">
+    <template id="wx_util_b" template="wx">

         <include>$(SRCDIR)</include>
         <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>
     </template>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     </template>

+    
+    <template id="wx_util_console" template="wx_util_b">
+        <app-type>console</app-type>
+    </template>
+    
+    <template id="wx_sample" template="wx_util">
+        <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+    </template>
+    <template id="wx_sample_console" template="wx_util_console">
+        <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+    </template>

 
     
     <!-- =============================================================== -->
 
     
     <!-- =============================================================== -->


@@ -38,11 +54,20 @@
             <dstdir>$(BUILDDIR)</dstdir>
             <srcdir>$(SRCDIR)</srcdir>
         </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-tag name="files">
             <clean-files>
                 $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
             </clean-files>
         </define-tag>

+        -->

     </define-rule>
 
 </makefile>
     </define-rule>
 
 </makefile>