diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 55 |
1 files changed, 41 insertions, 14 deletions
@@ -809,18 +809,6 @@ get_subengines_build_string() { } # -# Greet user -# -echo "Running ScummVM configure..." -echo "Configure run on" `date` > $TMPLOG -cat >> $TMPLOG <<EOF -Invocation command line was: -$0 $@ -Saved environment variables: -LDFLAGS="$SAVED_LDFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" ASFLAGS="$SAVED_ASFLAGS" WINDRESFLAGS="$SAVED_WINDRESFLAGS" SDL_CONFIG="$SAVED_SDL_CONFIG" -EOF - -# # Check any parameters we received # # TODO: @@ -992,8 +980,8 @@ Optional Libraries: installed (optional) --disable-fluidsynth disable fluidsynth MIDI driver [autodetect] - --with-sparkle-prefix=DIR Prefix where sparkle is installed (Mac OS X only - optional) - --disable-sparkle disable sparkle automatic update support [Mac OS X only - autodetect] + --with-sparkle-prefix=DIR Prefix where sparkle is installed (OS X/Windows only - optional) + --disable-sparkle disable sparkle automatic update support [OS X/Windows only - autodetect] --disable-osx-dock-plugin disable the NSDockTilePlugin support [Mac OS X only - autodetect] @@ -1031,6 +1019,20 @@ EOF fi done # for parm in ... + +# +# If we're not showing help, greet the user and start the log file +# +echo "Running ScummVM configure..." +echo "Configure run on" `date` > $TMPLOG +cat >> $TMPLOG <<EOF +Invocation command line was: +$0 $@ +Saved environment variables: +LDFLAGS="$SAVED_LDFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" ASFLAGS="$SAVED_ASFLAGS" WINDRESFLAGS="$SAVED_WINDRESFLAGS" SDL_CONFIG="$SAVED_SDL_CONFIG" +EOF + + for ac_option in $@; do case "$ac_option" in --disable-16bit) _16bit=no ;; @@ -4038,6 +4040,31 @@ EOF fi echo "$_sparkle" ;; + mingw*) + echocheck "Sparkle" + if test "$_updates" = no; then + _sparkle=no + else + if test ! -z $_sparklepath ; then + SPARKLE_CFLAGS="-I$_sparklepath/include" + SPARKLE_LIBS="-L$_sparklepath/Release -L$_sparklepath/x64/Release" + fi + if test "$_sparkle" = auto ; then + _sparkle=no + cat > $TMPC << EOF +#include <winsparkle.h> +int main(void) { win_sparkle_get_update_check_interval(); return 0; } +EOF + cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -lWinSparkle && _sparkle=yes + fi + if test "$_sparkle" = yes ; then + append_var LIBS "$SPARKLE_LIBS -lWinSparkle" + append_var INCLUDES "$SPARKLE_CFLAGS" + fi + define_in_config_if_yes "$_sparkle" 'USE_SPARKLE' + fi + echo "$_sparkle" + ;; *) _sparkle=no ;; |