[Scummvm-git-logs] scummvm master -> ad648f8a972cbd2ac61d594c6f0d2f6981bb84d3

[digitall]

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

Summary:
ad648f8a97 CONFIGURE: Append pkg-config cflags to CXXFLAGS


Commit: ad648f8a972cbd2ac61d594c6f0d2f6981bb84d3
    https://github.com/scummvm/scummvm/commit/ad648f8a972cbd2ac61d594c6f0d2f6981bb84d3
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-02-24T11:29:09Z

Commit Message:
CONFIGURE: Append pkg-config cflags to CXXFLAGS

CPPFLAGS should only contain options that are used by the preprocessor, however pkg-config may return C/C++ specific options which are unrecognised by windres.

Changed paths:
    configure


diff --git a/configure b/configure
index 5549298..f3e68b2 100755
--- a/configure
+++ b/configure
@@ -4827,7 +4827,7 @@ if test "$_libunity" = yes ; then
 		LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
 	fi
 	append_var LIBS "$LIBUNITY_LIBS"
-	append_var INCLUDES "$LIBUNITY_CFLAGS"
+	append_var CXXFLAGS "$LIBUNITY_CFLAGS"
 fi
 define_in_config_h_if_yes "$_libunity" 'USE_UNITY'
 fi
@@ -4901,7 +4901,7 @@ EOF
 
 		if test "$_freetype2" = "yes"; then
 			append_var LIBS "$FREETYPE2_LIBS"
-			append_var INCLUDES "$FREETYPE2_CFLAGS"
+			append_var CXXFLAGS "$FREETYPE2_CFLAGS"
 		fi
 	fi