thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Fix creating OS X application bundle when Sparkle is enabled

Browse source
This commit is contained in:
Thierry Crozat 2016-03-27 13:04:42 +01:00
parent dec810647e
commit 1b42aae040
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -183,6 +183,7 @@ _win32path="c:/scummvm"
_amigaospath="Games:ScummVM" _amigaospath="Games:ScummVM"
_staticlibpath= _staticlibpath=
_xcodetoolspath= _xcodetoolspath=
_sparklepath=
_sdlconfig=sdl-config _sdlconfig=sdl-config
_freetypeconfig=freetype-config _freetypeconfig=freetype-config
_sdlpath="$PATH" _sdlpath="$PATH"
@ -1173,8 +1174,7 @@ for ac_option in $@; do
;; ;;
--with-sparkle-prefix=*) --with-sparkle-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2` arg=`echo $ac_option | cut -d '=' -f 2`
SPARKLE_CFLAGS="-F$arg" _sparklepath=$arg
SPARKLE_LIBS="-F$arg"
;; ;;
--with-readline-prefix=*) --with-readline-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2` arg=`echo $ac_option | cut -d '=' -f 2`
@ -3946,6 +3946,10 @@ case $_host_os in
if test "$_updates" = no; then if test "$_updates" = no; then
_sparkle=no _sparkle=no
else else
if test ! -z $_sparklepath ; then
SPARKLE_CFLAGS="-F$_sparklepath"
SPARKLE_LIBS="-F$_sparklepath"
fi
if test "$_sparkle" = auto ; then if test "$_sparkle" = auto ; then
_sparkle=no _sparkle=no
cat > $TMPC << EOF cat > $TMPC << EOF
@ -4791,6 +4795,7 @@ WIN32PATH=$_win32path
AMIGAOSPATH=$_amigaospath AMIGAOSPATH=$_amigaospath
STATICLIBPATH=$_staticlibpath STATICLIBPATH=$_staticlibpath
XCODETOOLSPATH=$_xcodetoolspath XCODETOOLSPATH=$_xcodetoolspath
SPARKLEPATH=$_sparklepath
SDLCONFIG=$_sdlconfig SDLCONFIG=$_sdlconfig
ABI := $ABI ABI := $ABI

8
ports.mk
View file

@ -97,7 +97,8 @@ endif
ifdef USE_SPARKLE ifdef USE_SPARKLE
mkdir -p $(bundle_name)/Contents/Frameworks mkdir -p $(bundle_name)/Contents/Frameworks
cp $(srcdir)/dists/macosx/dsa_pub.pem $(bundle_name)/Contents/Resources/ 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 endif
cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/ cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(DIST_FILES_DOCS) $(bundle_name)/ cp $(DIST_FILES_DOCS) $(bundle_name)/
@ -329,7 +330,10 @@ OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
endif endif
ifdef USE_SPARKLE 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 endif
# Special target to create a static linked binary for Mac OS X. # Special target to create a static linked binary for Mac OS X.