diff options
| author | Johannes Schickel | 2014-01-21 14:15:19 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2014-01-21 14:15:19 -0800 |
| commit | f93ebdc936523984212fd3a150dc86efe80a4004 (patch) | |
| tree | 89d60bc8f4c1ba7696de9f96fbf53c297c47fabc /configure | |
| parent | 51c0f0e6971c43d210f985c8a5ae5d857fbf6f2a (diff) | |
| parent | db07a1cfacdb67be02a64dcecfb22e773a733fca (diff) | |
| download | scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.tar.gz scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.tar.bz2 scummvm-rg350-f93ebdc936523984212fd3a150dc86efe80a4004.zip | |
Merge pull request #421 from lordhoto/taskbar-cleanup
BUILD: Taskbar Cleanup/Fixes
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -126,7 +126,7 @@ _opengl=auto _opengles=auto _readline=auto _freetype2=auto -_taskbar=yes +_taskbar=auto _updates=no _libunity=auto # Default option behavior yes/no @@ -2427,7 +2427,6 @@ if test -n "$_host"; then CXXFLAGS="$CXXFLAGS -fno-delayed-branch" _backend="dc" _build_scalers=no - _taskbar=no _mad=yes _zlib=yes add_line_to_config_mk 'ronindir = /usr/local/ronin' @@ -2686,7 +2685,6 @@ if test -n "$_host"; then _backend="tizen" _port_mk="backends/platform/tizen/tizen.mk" _arm_asm=yes - _taskbar=no _build_scalers=no _seq_midi=no _mt32emu=no @@ -3728,7 +3726,7 @@ if test "$_libunity" = yes ; then LIBS="$LIBS $LIBUNITY_LIBS" INCLUDES="$INCLUDES $LIBUNITY_CFLAGS" fi -define_in_config_h_if_yes "$_libunity" 'USE_TASKBAR_UNITY' +define_in_config_h_if_yes "$_libunity" 'USE_UNITY' fi echo "$_libunity" @@ -3990,24 +3988,27 @@ fi # Check whether to build taskbar integration support # echo_n "Building taskbar integration support... " -define_in_config_if_yes $_taskbar 'USE_TASKBAR' -if test "$_taskbar" = yes; then +if test "$_taskbar" = "no"; then + echo "no" +else case $_host_os in mingw*) LIBS="$LIBS -lole32 -luuid" echo "win32" + _taskbar=yes ;; *) if test "$_libunity" = yes; then echo "unity" + _taskbar=yes else - echo "$_taskbar" + echo "no" + _taskbar=no fi ;; esac -else - echo "$_taskbar" fi +define_in_config_if_yes $_taskbar 'USE_TASKBAR' # # Check whether to build Bink video support |