thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Fix Unity checks

Browse source 
- Redirect pkgconfig errors to log file
 - Remove duplicated -lunity option
 - Fix output of selected taskbar integration when libunity is selected
This commit is contained in:
Littleboy 2011-06-22 19:06:30 -04:00
parent 85bb5ef45e
commit 27934d061e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure vendored
View file

@ -2995,8 +2995,8 @@ if test "$_libunity" = auto ; then
;; ;;
*) *)
# Unity has a lots of dependencies, update the libs and cflags var with them # Unity has a lots of dependencies, update the libs and cflags var with them
LIBUNITY_LIBS="$LIBUNITY_LIBS $(pkg-config --libs unity = 3.8.4)" LIBUNITY_LIBS="$LIBUNITY_LIBS $(pkg-config --libs unity = 3.8.4 2>> "$TMPLOG")"
LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS $(pkg-config --cflags unity = 3.8.4)" LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS $(pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG")"
_libunity=no _libunity=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <unity.h> #include <unity.h>
@ -3005,12 +3005,12 @@ int main(void) {
return 0; return 0;
} }
EOF EOF
cc_check $LIBUNITY_CFLAGS $LIBUNITY_LIBS -lunity && _libunity=yes cc_check $LIBUNITY_CFLAGS $LIBUNITY_LIBS && _libunity=yes
;; ;;
esac esac
fi fi
if test "$_libunity" = yes ; then if test "$_libunity" = yes ; then
LIBS="$LIBS $LIBUNITY_LIBS -lunity" LIBS="$LIBS $LIBUNITY_LIBS"
INCLUDES="$INCLUDES $LIBUNITY_CFLAGS" INCLUDES="$INCLUDES $LIBUNITY_CFLAGS"
fi fi
define_in_config_h_if_yes "$_libunity" 'USE_TASKBAR_UNITY' define_in_config_h_if_yes "$_libunity" 'USE_TASKBAR_UNITY'
@ -3204,7 +3204,7 @@ if test "$_taskbar" = yes; then
echo "win32" echo "win32"
;; ;;
*) *)
if test "$_unity" = yes; then if test "$_libunity" = yes; then
echo "unity" echo "unity"
else else
echo "$_taskbar" echo "$_taskbar"