BACKENDS: Add WIP Unity support

1 files changed, 13 insertions, 10 deletions

diff --git a/configure b/configure
index fca8791b40..fc0e3c0e3e 100755
--- a/configure
+++ b/configure
@@ -138,7 +138,7 @@ _fluidsynth=auto
 _opengl=auto
 _opengles=auto
 _readline=auto
-_taskbar=auto
+_unity=auto
 # Default option behaviour yes/no
 _debug_build=auto
 _release_build=auto
@@ -822,8 +822,8 @@ for ac_option in $@; do
 	--disable-fluidsynth)     _fluidsynth=no  ;;
 	--enable-readline)        _readline=yes   ;;
 	--disable-readline)       _readline=no    ;;
-	--enable-taskbar)         _taskbar=yes    ;;
-	--disable-taskbar)        _taskbar=no     ;;
+	--enable-unity)           _unity=yes      ;;
+	--disable-unity)          _unity=no       ;;
 	--enable-opengl)          _opengl=yes     ;;
 	--disable-opengl)         _opengl=no      ;;
 	--enable-verbose-build)   _verbose_build=yes ;;
@@ -2934,21 +2934,24 @@ define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'
 #
 # Check for Unity if taskbar integration is enabled
 #
-echocheck "taskbar"
-if test "$_taskbar" = auto ; then
-	_taskbar=no
+echocheck "unity"
+# Unity has a lots of dependency, update the libs and cflags var with them
+UNITY_LIBS="$UNITY_LIBS $(pkg-config --libs unity)"
+UNITY_CFLAGS="$UNITY_CFLAGS $(pkg-config --cflags unity)"
+if test "$_unity" = auto ; then
+	_unity=no
 	cat > $TMPC << EOF
 #include <unity.h>
 int main(void) { return 0; }
 EOF
-	cc_check $UNITY_CFLAGS $UNITY_LIBS -lunity && _taskbar=yes
+	cc_check $UNITY_CFLAGS $UNITY_LIBS -lunity && _unity=yes
 fi
-if test "$_taskbar" = yes ; then
+if test "$_unity" = yes ; then
 	LIBS="$LIBS $UNITY_LIBS -lunity"
 	INCLUDES="$INCLUDES $UNITY_CFLAGS"
 fi
-define_in_config_h_if_yes "$_taskbar" 'USE_TASKBAR'
-echo "$_taskbar"
+define_in_config_h_if_yes "$_unity" 'USE_TASKBAR'
+echo "$_unity"
 
 #
 # Check for OpenGL (ES)