added func parameter to wxOnAssert

[wxWidgets.git] / build / bakefiles / wxpresets / presets / wx_unix.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index a9d3d3684de570ab8453fa7c9ce8f4e05a144ac1..21c0fad580f50f61828b8d71649e3d9499436c74 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -7,7 +7,7 @@ See wx.bkl for platform-independent notes.
 
 Usage:
     Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
 
 Usage:
     Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.

-    
+

 
 Format-specific notes:
 
 
 Format-specific notes:
 


@@ -23,15 +23,16 @@ Format-specific notes:
     <!-- ============================================================== -->
     <!--                           Autoconf                             -->
     <!-- ============================================================== -->
     <!-- ============================================================== -->
     <!--                           Autoconf                             -->
     <!-- ============================================================== -->

-    
+

     <if cond="FORMAT=='autoconf'">
         <!-- Autoconf backend is simplicity itself thanks to wx-config... -->
         <option name="WX_CFLAGS"/>
         <option name="WX_CXXFLAGS"/>
         <option name="WX_CPPFLAGS"/>
         <option name="WX_LIBS"/>
     <if cond="FORMAT=='autoconf'">
         <!-- Autoconf backend is simplicity itself thanks to wx-config... -->
         <option name="WX_CFLAGS"/>
         <option name="WX_CXXFLAGS"/>
         <option name="WX_CPPFLAGS"/>
         <option name="WX_LIBS"/>

+        <option name="WX_RESCOMP"/>

     </if>
     </if>

-    
+

     <!-- ============================================================== -->
     <!--                   GNU makefiles for Unix                       -->
     <!-- ============================================================== -->
     <!-- ============================================================== -->
     <!--                   GNU makefiles for Unix                       -->
     <!-- ============================================================== -->


@@ -57,29 +58,65 @@ Format-specific notes:
             <default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
             <description>wxWidgets libraries to link against</description>
         </option>
             <default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
             <description>wxWidgets libraries to link against</description>
         </option>

+        <option name="WX_RESCOMP">
+            <default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
+            <description>wxWidgets resource compiler and flags</description>
+        </option>

 
         <!-- we need this but the trick used in default-values above
              prevents bakefile from detecting it: -->
         <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
     </if>
 
         <!-- we need this but the trick used in default-values above
              prevents bakefile from detecting it: -->
         <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
     </if>

-    
+

     <!-- ============================================================== -->
     <!--                          Common code                           -->
     <!-- ============================================================== -->
     <!-- ============================================================== -->
     <!--                          Common code                           -->
     <!-- ============================================================== -->

-    
+

     <if cond="FORMAT not in ['gnu','autoconf']">
         <error>
             Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
         </error>
     </if>
     <if cond="FORMAT not in ['gnu','autoconf']">
         <error>
             Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
         </error>
     </if>

-    
-    <template id="wx">
+
+    <!--
+         We need to re-define the resource compiler, used by bakefile when compiling
+         resources, to the resource compiler returned by 'wx-config --rescomp' since
+         'wx-config --rescomp' returns both the name of the resource compiler to use
+         and the flags required for that compiler (rcflags are rccompiler-specific
+         and thus it would be wrong to use them with other resource compilers).
+
+         This line typically does something *only* when the Makefile.in generated
+         using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
+         are not compiled at all).
+
+         NOTE: overwriting the RESCOMP variable we modify the entire Bakefile behaviour
+               for resource compilation; this could be a problem if the bakefile which
+               includes this file needs the standard Bakefile resource compiler to
+               build a non wx-based application.
+    -->
+    <set var="RESCOMP">$(WX_RESCOMP)</set>
+
+    <template id="wx-lib">

         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>
         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>

-        <ldlibs>$(WX_LIBS)</ldlibs>
+    </template>
+
+    <template id="wx" template="wx-lib">
+        <!--
+            Don't include the $(WX_LIBS) variable in linker options here since
+            it would make impossible for the user to obtain the right library
+            order when he needs to specify, *before* WX_LIBS, its own libraries
+            that depend on wxWidgets libraries; to avoid this, we include
+            $(WX_LIBS) as soon as we found the <wx-lib>base</wx-lib> tag which
+            the user should always put *after* all other wx-dependent libraries
+        -->

     </template>
 
     <!-- not used together with wx-config: -->
     </template>
 
     <!-- not used together with wx-config: -->

-    <define-tag name="wx-lib" rules="exe,dll,module"/>
+    <define-tag name="wx-lib" rules="exe,dll,module">
+        <if cond="value=='base'">
+            <ldlibs>$(WX_LIBS)</ldlibs>
+        </if>
+    </define-tag>

 
 </makefile>
 
 </makefile>