adding generic BUNDLE_RESOURCES for copying any special resources into the bundle, renaming BUNDLE_ICONS to BUNDLE_ICON = the path of the app icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0b1345939a
commit
78a9167e55
@ -18,9 +18,10 @@
|
|||||||
<set var="BUNDLE_PLIST" overwrite="0">
|
<set var="BUNDLE_PLIST" overwrite="0">
|
||||||
$(TOP_SRCDIR)src/osx/carbon/Info.plist.in
|
$(TOP_SRCDIR)src/osx/carbon/Info.plist.in
|
||||||
</set>
|
</set>
|
||||||
<set var="BUNDLE_ICONS" overwrite="0">
|
<set var="BUNDLE_ICON" overwrite="0">
|
||||||
$(TOP_SRCDIR)src/osx/carbon/wxmac.icns
|
$(TOP_SRCDIR)src/osx/carbon/wxmac.icns
|
||||||
</set>
|
</set>
|
||||||
|
<set var="BUNDLE_RESOURCES" overwrite="0"></set>
|
||||||
|
|
||||||
<define-tag name="wx-mac-app-bundle" rules="exe">
|
<define-tag name="wx-mac-app-bundle" rules="exe">
|
||||||
|
|
||||||
@ -38,7 +39,8 @@
|
|||||||
<!-- required data: -->
|
<!-- required data: -->
|
||||||
<depends>$(id)</depends>
|
<depends>$(id)</depends>
|
||||||
<depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
|
<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>
|
<command>
|
||||||
<!-- create the directories: -->
|
<!-- create the directories: -->
|
||||||
@ -58,9 +60,16 @@
|
|||||||
<!-- make a hardlink to the binary: -->
|
<!-- make a hardlink to the binary: -->
|
||||||
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
|
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
|
||||||
|
|
||||||
<!-- ditto wxWidgets resources and icons: -->
|
<!-- copy the application icon: -->
|
||||||
cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources
|
cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
|
||||||
</command>
|
</command>
|
||||||
|
<if cond="BUNDLE_RESOURCES!=''">
|
||||||
|
<command>
|
||||||
|
<!-- copy all other bundle resources: -->
|
||||||
|
cp -f $(BUNDLE_RESOURCES) $(BUNDLE)/Resources
|
||||||
|
</command>
|
||||||
|
</if>
|
||||||
|
|
||||||
</modify-target>
|
</modify-target>
|
||||||
|
|
||||||
<!-- add pseudo target id_bundle: -->
|
<!-- add pseudo target id_bundle: -->
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>EXECUTABLE</string>
|
<string>EXECUTABLE</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>doc.icns</string>
|
<string>wxmac.icns</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
<string>EXECUTABLE</string>
|
<string>EXECUTABLE</string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
<set var="BUNDLE_PLIST">$(SRCDIR)/Info.plist.in</set>
|
<set var="BUNDLE_PLIST">$(SRCDIR)/Info.plist.in</set>
|
||||||
<set var="BUNDLE_ICONS">$(SRCDIR)/chart.icns $(SRCDIR)/doc.icns $(SRCDIR)/notepad.icns</set>
|
<set var="BUNDLE_ICON">$(SRCDIR)/doc.icns</set>
|
||||||
|
<set var="BUNDLE_RESOURCES">$(SRCDIR)/chart.icns $(SRCDIR)/notepad.icns</set>
|
||||||
|
|
||||||
<include file="../../build/bakefiles/common_samples.bkl"/>
|
<include file="../../build/bakefiles/common_samples.bkl"/>
|
||||||
|
|
||||||
@ -11,7 +12,6 @@
|
|||||||
<wx-lib>core</wx-lib>
|
<wx-lib>core</wx-lib>
|
||||||
<wx-lib>base</wx-lib>
|
<wx-lib>base</wx-lib>
|
||||||
<win32-res>docview.rc</win32-res>
|
<win32-res>docview.rc</win32-res>
|
||||||
<mac-res>chart.r doc.r docview.r mondrian.r</mac-res>
|
|
||||||
</exe>
|
</exe>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
Loading…
Reference in New Issue
Block a user