diff options
author | Julien | 2011-06-16 12:30:40 -0400 |
---|---|---|
committer | Julien | 2011-06-16 14:27:21 -0400 |
commit | 179630b46b8e24d6c87c114f97efa076a8fc19fa (patch) | |
tree | 38aa6f7abb261b5f279a5f44b84b94d71e061314 | |
parent | 8729af342f42a68893ac473841373002e2a06e9d (diff) | |
download | scummvm-rg350-179630b46b8e24d6c87c114f97efa076a8fc19fa.tar.gz scummvm-rg350-179630b46b8e24d6c87c114f97efa076a8fc19fa.tar.bz2 scummvm-rg350-179630b46b8e24d6c87c114f97efa076a8fc19fa.zip |
CONFIGURE: Only add linking to ole32 and uuid when taskbar support is compiled for Win32
We also show the type of taskbar integration being compiled.
-rwxr-xr-x | configure | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -1785,7 +1785,7 @@ case $_host_os in mingw*) DEFINES="$DEFINES -DWIN32" DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0" - LIBS="$LIBS -lmingw32 -lwinmm -lole32 -luuid" + LIBS="$LIBS -lmingw32 -lwinmm" OBJS="$OBJS scummvmwinres.o" add_line_to_config_mk 'WIN32 = 1' ;; @@ -3152,7 +3152,23 @@ fi # echo_n "Building taskbar integration support... " define_in_config_if_yes $_taskbar 'USE_TASKBAR' -echo "$_taskbar" +if test "$_taskbar" = yes; then + case $_host_os in + mingw*) + LIBS="$LIBS -lole32 -luuid" + echo "win32" + ;; + *) + if test "$_unity" = yes; then + echo "unity" + else + echo "$_taskbar" + fi + ;; + esac +else + echo "$_taskbar" +fi # # Figure out installation directories |