aboutsummaryrefslogtreecommitdiff
path: root/ports.mk
diff options
context:
space:
mode:
authorThierry Crozat2016-03-27 13:04:42 +0100
committerThierry Crozat2016-03-27 13:06:30 +0100
commit1b42aae040f0b9d327714c3cdeb0f108c77d459b (patch)
tree3b2d60ee32045e489d2ac1377b98851e51ba350f /ports.mk
parentdec810647eed02fae065ea425788e677bb98e119 (diff)
downloadscummvm-rg350-1b42aae040f0b9d327714c3cdeb0f108c77d459b.tar.gz
scummvm-rg350-1b42aae040f0b9d327714c3cdeb0f108c77d459b.tar.bz2
scummvm-rg350-1b42aae040f0b9d327714c3cdeb0f108c77d459b.zip
BUILD: Fix creating OS X application bundle when Sparkle is enabled
Diffstat (limited to 'ports.mk')
-rw-r--r--ports.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/ports.mk b/ports.mk
index 155bc57fdd..03092e23ef 100644
--- a/ports.mk
+++ b/ports.mk
@@ -97,7 +97,8 @@ endif
ifdef USE_SPARKLE
mkdir -p $(bundle_name)/Contents/Frameworks
cp $(srcdir)/dists/macosx/dsa_pub.pem $(bundle_name)/Contents/Resources/
- cp -R $(STATICLIBPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
+ rm -rf $(bundle_name)/Contents/Frameworks/Sparkle.framework
+ cp -R $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
endif
cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(DIST_FILES_DOCS) $(bundle_name)/
@@ -329,7 +330,10 @@ OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
endif
ifdef USE_SPARKLE
-OSX_STATIC_LIBS += -framework Sparkle -F$(STATICLIBPATH)
+ifneq ($(SPARKLEPATH),)
+OSX_STATIC_LIBS += -F$(SPARKLEPATH)
+endif
+OSX_STATIC_LIBS += -framework Sparkle -Wl,-rpath,@loader_path/../Frameworks
endif
# Special target to create a static linked binary for Mac OS X.