From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 1 Oct 2003 10:23:27 +0000 (+0000)
Subject: wx resource file must be linked into executables on OS/2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9e983cb2b9056a4c58d75dfe52331ccd3e0d8240

wx resource file must be linked into executables on OS/2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index f9a5e3da58..1679475e87 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -32,6 +32,9 @@
         <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>
+        <if cond="FORMAT=='autoconf'">
+            <wx-os2-lib-resource/>
+        </if>
     </template>
     
     <template id="wx_util_console" template="wx_util_b">
@@ -78,9 +81,29 @@
         </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>