diff options
author | Oystein Eftevaag | 2011-08-02 16:09:58 -0700 |
---|---|---|
committer | Oystein Eftevaag | 2011-08-02 16:09:58 -0700 |
commit | 9044e17499797ef007c9c8240d79f69382f61765 (patch) | |
tree | b686c9fc28f0d2eae4c0db3ff98687f43556066a /configure | |
parent | 8f70ee9afc877b22123269669d155e710a467c4b (diff) | |
parent | efd9dff55662e1c0c4c794ed8f0143a87cc5fa0d (diff) | |
download | scummvm-rg350-9044e17499797ef007c9c8240d79f69382f61765.tar.gz scummvm-rg350-9044e17499797ef007c9c8240d79f69382f61765.tar.bz2 scummvm-rg350-9044e17499797ef007c9c8240d79f69382f61765.zip |
Merge pull request #52 from CeRiAl/macosx-sparkle
MACOSX: Add Sparkle support
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 54 |
1 files changed, 54 insertions, 0 deletions
@@ -135,6 +135,7 @@ _alsa=auto _seq_midi=auto _timidity=auto _zlib=auto +_sparkle=auto _png=auto _theoradec=auto _faad=auto @@ -143,6 +144,7 @@ _opengl=auto _opengles=auto _readline=auto _taskbar=yes +_updates=yes _libunity=auto # Default option behaviour yes/no _debug_build=auto @@ -773,6 +775,7 @@ Optional Features: --disable-hq-scalers exclude HQ2x and HQ3x scalers --disable-translation don't build support for translated messages --disable-taskbar don't build support for taskbar and launcher integration + --disable-updates don't build support for updates --enable-text-console use text console instead of graphical console --enable-verbose-build enable regular echoing of commands during build process @@ -814,6 +817,9 @@ Optional Libraries: installed (optional) --disable-fluidsynth disable fluidsynth MIDI driver [autodetect] + --with-sparkle-prefix=DIR Prefix where sparkle is installed (MacOSX only - optional) + --disable-sparkle disable sparkle automatic update support [MacOSX only - autodetect] + --with-sdl-prefix=DIR Prefix where the sdl-config script is installed (optional) @@ -862,6 +868,8 @@ for ac_option in $@; do --disable-mad) _mad=no ;; --enable-zlib) _zlib=yes ;; --disable-zlib) _zlib=no ;; + --enable-sparkle) _sparkle=yes ;; + --disable-sparkle) _sparkle=no ;; --enable-nasm) _nasm=yes ;; --disable-nasm) _nasm=no ;; --disable-png) _png=no ;; @@ -875,6 +883,8 @@ for ac_option in $@; do --disable-readline) _readline=no ;; --enable-taskbar) _taskbar=yes ;; --disable-taskbar) _taskbar=no ;; + --enable-updates) _updates=yes ;; + --disable-updates) _updates=no ;; --enable-libunity) _libunity=yes ;; --disable-libunity) _libunity=no ;; --enable-opengl) _opengl=yes ;; @@ -949,6 +959,11 @@ for ac_option in $@; do ZLIB_CFLAGS="-I$arg/include" ZLIB_LIBS="-L$arg/lib" ;; + --with-sparkle-prefix=*) + arg=`echo $ac_option | cut -d '=' -f 2` + SPARKLE_CFLAGS="-F$arg" + SPARKLE_LIBS="-F$arg" + ;; --with-readline-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` READLINE_CFLAGS="-I$arg/include" @@ -2972,6 +2987,30 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then fi # +# Check for Sparkle if updates support is enabled +# +echocheck "Sparkle" +if test "$_updates" = no; then + _sparkle=no +else +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 + LIBS="$LIBS $SPARKLE_LIBS -framework Sparkle" + INCLUDES="$INCLUDES $SPARKLE_CFLAGS" +fi +define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' +fi +echo "$_sparkle" + +# # Check for libfluidsynth # echocheck "libfluidsynth" @@ -3278,6 +3317,21 @@ define_in_config_if_yes $_bink 'USE_BINK' echo "$_bink" # +# Check whether to build updates support +# +echo_n "Building updates support... " +define_in_config_if_yes $_updates 'USE_UPDATES' +if test "$_updates" = yes; then + if test "$_sparkle" = yes; then + echo "Sparkle" + else + echo "$_updates" + fi +else + echo "$_updates" +fi + +# # Figure out installation directories # test "x$prefix" = xNONE && prefix=/usr/local |