diff options
| author | Thierry Crozat | 2016-03-27 13:04:42 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2016-03-27 13:06:30 +0100 |
| commit | 1b42aae040f0b9d327714c3cdeb0f108c77d459b (patch) | |
| tree | 3b2d60ee32045e489d2ac1377b98851e51ba350f /configure | |
| parent | dec810647eed02fae065ea425788e677bb98e119 (diff) | |
| download | scummvm-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 'configure')
| -rwxr-xr-x | configure | 29 |
1 files changed, 17 insertions, 12 deletions
@@ -183,6 +183,7 @@ _win32path="c:/scummvm" _amigaospath="Games:ScummVM" _staticlibpath= _xcodetoolspath= +_sparklepath= _sdlconfig=sdl-config _freetypeconfig=freetype-config _sdlpath="$PATH" @@ -1173,8 +1174,7 @@ for ac_option in $@; do ;; --with-sparkle-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` - SPARKLE_CFLAGS="-F$arg" - SPARKLE_LIBS="-F$arg" + _sparklepath=$arg ;; --with-readline-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` @@ -3946,20 +3946,24 @@ case $_host_os in if test "$_updates" = no; then _sparkle=no else - if test "$_sparkle" = auto ; then - _sparkle=no - cat > $TMPC << EOF + if test ! -z $_sparklepath ; then + SPARKLE_CFLAGS="-F$_sparklepath" + SPARKLE_LIBS="-F$_sparklepath" + fi + if test "$_sparkle" = auto ; then + _sparkle=no + cat > $TMPC << EOF #include <Cocoa/Cocoa.h> #include <Sparkle/Sparkle.h> int main(void) { SUUpdater *updater = [SUUpdater sharedUpdater]; return 0; } EOF - cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes - fi - if test "$_sparkle" = yes ; then - append_var LIBS "$SPARKLE_LIBS -framework Sparkle" - append_var INCLUDES "$SPARKLE_CFLAGS" - fi - define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' + cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes + fi + if test "$_sparkle" = yes ; then + append_var LIBS "$SPARKLE_LIBS -framework Sparkle" + append_var INCLUDES "$SPARKLE_CFLAGS" + fi + define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' fi echo "$_sparkle" ;; @@ -4791,6 +4795,7 @@ WIN32PATH=$_win32path AMIGAOSPATH=$_amigaospath STATICLIBPATH=$_staticlibpath XCODETOOLSPATH=$_xcodetoolspath +SPARKLEPATH=$_sparklepath SDLCONFIG=$_sdlconfig ABI := $ABI |