Correct decoding of 4-byte integers in png2c script.

[wxWidgets.git] / utils / wxrc / wxrc.bkl

diff --git a/utils/wxrc/wxrc.bkl b/utils/wxrc/wxrc.bkl
index 20bba0c0bff71dc9a0e061bc098f97617fc684d5..d05c53b122e714aa597c3701e6561510cd19679f 100644 (file)
--- a/utils/wxrc/wxrc.bkl
+++ b/utils/wxrc/wxrc.bkl
@@ -1,15 +1,31 @@
 <?xml version="1.0" ?>
 <makefile>
 
 <?xml version="1.0" ?>
 <makefile>
 

-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
+    <include file="../../build/bakefiles/common_samples.bkl"/>

 
 

-    <exe id="wxrc" template="wx_util_console" template_append="wx_append">
+    <exe id="wxrc" cond="USE_XRC=='1'"
+         template="wx_util_console" template_append="wx_append_base">

         <sources>wxrc.cpp</sources>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>wxrc.cpp</sources>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>

-        <ldlibs>$(EXTRALIBS_XML)</ldlibs>

         <install-to>$(BINDIR)</install-to>
     </exe>
 
         <install-to>$(BINDIR)</install-to>
     </exe>
 

+    <if cond="FORMAT=='autoconf'">
+        
+        <!-- Install wxrc as $prefix/bin/wxrc-$version with a wxrc symlink
+             pointing to it, so that users can use wxrc from different
+             versions. -->
+    
+        <set var="versioned_name">wxrc-$(WX_RELEASE)</set>
+        <modify-target target="install_wxrc">
+            <command>
+               rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+               $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
+                mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; $(LN_S) $(versioned_name) wxrc$(EXEEXT))
+            </command>
+        </modify-target>
+    </if>
+

 </makefile>
 </makefile>