diff options
author | Julien | 2011-06-16 11:57:06 -0400 |
---|---|---|
committer | Julien | 2011-06-16 14:27:19 -0400 |
commit | 8729af342f42a68893ac473841373002e2a06e9d (patch) | |
tree | e4b64a9a0c98be3b06c1074a39e0f02cf813d5a9 /configure | |
parent | 599695bc4f70c28c556e2c78822eda6ef29d2faa (diff) | |
download | scummvm-rg350-8729af342f42a68893ac473841373002e2a06e9d.tar.gz scummvm-rg350-8729af342f42a68893ac473841373002e2a06e9d.tar.bz2 scummvm-rg350-8729af342f42a68893ac473841373002e2a06e9d.zip |
CONFIGURE: Disable check for unity when compiling with mingw (pkg-config is not available)
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -2943,18 +2943,26 @@ if test "$_unix" = no || test "$_taskbar" = no; then _libunity=no else if test "$_libunity" = auto ; then - # Unity has a lots of dependencies, update the libs and cflags var with them - LIBUNITY_LIBS="$LIBUNITY_LIBS $(pkg-config --libs unity)" - LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS $(pkg-config --cflags unity)" - _libunity=no - cat > $TMPC << EOF + case $_host_os in + mingw*) + # pkgconfig and unity are not supported on mingw + _libunity=no + ;; + *) + # Unity has a lots of dependencies, update the libs and cflags var with them + LIBUNITY_LIBS="$LIBUNITY_LIBS $(pkg-config --libs unity)" + LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS $(pkg-config --cflags unity)" + _libunity=no + cat > $TMPC << EOF #include <unity.h> int main(void) { unity_launcher_entry_get_for_desktop_id("scummvm.desktop"); return 0; } EOF - cc_check $LIBUNITY_CFLAGS $LIBUNITY_LIBS -lunity && _libunity=yes + cc_check $LIBUNITY_CFLAGS $LIBUNITY_LIBS -lunity && _libunity=yes + ;; + esac fi if test "$_libunity" = yes ; then LIBS="$LIBS $LIBUNITY_LIBS -lunity" |