X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0b10e1b6f2bf580f6d1b632fea7cd3e11873abb..f0e5d5d22ce012e9312a63175d79c0f4a8d444be:/build/bakefiles/mac_bundles.bkl

diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index bf52f7634b..8e4527cd12 100644
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -18,9 +18,10 @@
     <set var="BUNDLE_PLIST" overwrite="0">
         $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
     </set>
-    <set var="BUNDLE_ICONS" overwrite="0">
+    <set var="BUNDLE_ICON" overwrite="0">
         $(TOP_SRCDIR)src/osx/carbon/wxmac.icns
     </set>
+    <set var="BUNDLE_RESOURCES" overwrite="0"></set>
 
     <define-tag name="wx-mac-app-bundle" rules="exe">
 
@@ -28,7 +29,11 @@
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
         <set var="BUNDLE_TGT_REF">
+            <!-- TODO Remove Mac -->
             <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_CARBON'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_COCOA'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_IPHONE'">$(BUNDLE)/PkgInfo</if>
             <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
         </set>
 
@@ -38,7 +43,8 @@
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
-            <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
+            <depends-on-file>$(BUNDLE_ICON)</depends-on-file>
+            <depends-on-file>$(BUNDLE_RESOURCES)</depends-on-file>
 
             <command>
                 <!-- create the directories: -->
@@ -55,12 +61,19 @@
                 <!-- PkgInfo: -->
                 echo -n "APPL????" >$(BUNDLE)/PkgInfo
 
-                <!-- make a hardlink to the binary: -->
+                <!-- move the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- ditto wxWidgets resources and icons: -->
-                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources
-            </command>            
+                <!-- copy the application icon: -->
+                cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
+	        </command>            
+            <if cond="BUNDLE_RESOURCES!=''">
+                <command>
+                    <!-- copy all other bundle resources: -->
+                    cp -f $(BUNDLE_RESOURCES) $(BUNDLE)/Resources
+                </command>
+            </if>
+ 
         </modify-target>
         
         <!-- add pseudo target id_bundle: -->