BUILD: use pkg-config to check freetype

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2020-03-07 (0.12.19)
 	COMMON: implement DEFINEKEY undo #92
+	UI: added R157 colour theme #94
 
 2020-02-13 (0.12.19)
 	AUDIO: fix integration with latest version of miniaudio library

configure.ac

@@ -156,8 +156,7 @@ function buildSDL() {
      AC_MSG_ERROR([libsdl2-dev not installed: configure failed.])
    fi
 
-   AC_CHECK_PROG(have_freetype2, freetype-config, [yes], [no])
-   if test "${have_freetype2}" = "no" ; then
+   if [ ! pkg-config --cflags freetype2 ]; then
      AC_MSG_ERROR([libfreetype6-dev not installed: configure failed.])
    fi
 
@@ -178,7 +177,7 @@ function buildSDL() {
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -mms-bitfields"
      PACKAGE_LIBS="${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
      PACKAGE_LIBS="${PACKAGE_LIBS} -Wl,-Bstatic -Wl,-Map=output.map"
-     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
+     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --static-libs` `pkg-config --libs freetype2`"
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 
@@ -193,7 +192,7 @@ function buildSDL() {
      dnl backlinking support for modules
      PACKAGE_LIBS="${PACKAGE_LIBS} -ldl"
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
-     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs` `freetype-config --libs`"
+     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs` `pkg-config --libs freetype2`"
      ;;
 
      *)
@@ -207,10 +206,10 @@ function buildSDL() {
      dnl backlinking support for modules
      PACKAGE_LIBS="${PACKAGE_LIBS} -ldl -no-pie"
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
-     PACKAGE_LIBS="-static-libgcc ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
+     PACKAGE_LIBS="-static-libgcc ${PACKAGE_LIBS} `sdl2-config --static-libs` `pkg-config --libs freetype2`"
    esac
 
-   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags` -fno-exceptions"
+   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `pkg-config --cflags freetype2` -fno-exceptions"
    CXXFLAGS="${CXXFLAGS} -fno-rtti -std=c++11"
 
    dnl preconfigured values for SDL build
@@ -441,6 +440,13 @@ echo ${TARGET}
 echo "CFLAGS=${CFLAGS}"
 echo "CXXFLAGS=${CXXFLAGS}"
 echo "PACKAGE_LIBS=${PACKAGE_LIBS}"
+
+if test x$ac_build_sdl = xyes; then
+   echo
+   echo "sdl2: `sdl2-config --version`"
+   echo "freetype: `pkg-config --version freetype2`"
+fi
+
 echo
 
 if test x$ac_build_dist = xyes; then

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
+    classpath 'com.android.tools.build:gradle:3.6.2'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }