[Scummvm-cvs-logs] scummvm master -> 04767e7b2a826f94e1daf259264f7f86cc515983

sev- sev at scummvm.org
Tue Sep 23 13:43:25 CEST 2014


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
651b271f61 CONFIGURE: Ask for unity >= 3.8.1
ba9401864c CONFIGURE: Use pkgconfig to get CFLAGS for Unity if not supplied
04767e7b2a Merge pull request #511 from tobiatesan/unity


Commit: 651b271f6102fc349c679172e069354049a6626b
    https://github.com/scummvm/scummvm/commit/651b271f6102fc349c679172e069354049a6626b
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-09-21T20:19:53+02:00

Commit Message:
CONFIGURE: Ask for unity >= 3.8.1
Previously we asked for unity == 3.8.1, which broke things everywhere else

Changed paths:
    configure



diff --git a/configure b/configure
index 541d1c2..7166dd7 100755
--- a/configure
+++ b/configure
@@ -3848,8 +3848,8 @@ 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 = 3.8.4 2>> "$TMPLOG"`"
-			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG"`"
+			LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
+			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
 			_libunity=no
 			cat > $TMPC << EOF
 #include <unity.h>


Commit: ba9401864ccc9b2aada36db12ab3a931a18b787c
    https://github.com/scummvm/scummvm/commit/ba9401864ccc9b2aada36db12ab3a931a18b787c
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-09-21T20:23:49+02:00

Commit Message:
CONFIGURE: Use pkgconfig to get CFLAGS for Unity if not supplied

This is not necessary if we got --with-libunity-prefix= (line
1447).
That's not always the case though.

Changed paths:
    configure



diff --git a/configure b/configure
index 7166dd7..5264e32 100755
--- a/configure
+++ b/configure
@@ -3863,6 +3863,10 @@ EOF
 	esac
 fi
 if test "$_libunity" = yes ; then
+	if test "$LIBUNITY_CFLAGS" = "" || test "$LIBUNITY_LIBS" = ""; then
+		LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
+		LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
+	fi
 	LIBS="$LIBS $LIBUNITY_LIBS"
 	INCLUDES="$INCLUDES $LIBUNITY_CFLAGS"
 fi


Commit: 04767e7b2a826f94e1daf259264f7f86cc515983
    https://github.com/scummvm/scummvm/commit/04767e7b2a826f94e1daf259264f7f86cc515983
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-09-23T13:42:46+02:00

Commit Message:
Merge pull request #511 from tobiatesan/unity

CONFIGURE: Fix support for libunity in configure

Changed paths:
    configure









More information about the Scummvm-git-logs mailing list