From bf13290fbcdc603f532cb2b01685e9f8a77e77e9 Mon Sep 17 00:00:00 2001 From: Thiep Ha Date: Wed, 6 Jul 2016 09:55:23 +0900 Subject: [PATCH] ecore_input: disable joystick feature in Mac OS Joystick input makes build break in MacOS, so we disable it. Change-Id: If145f7f54e681a5597089cef272c35e969e61f5b Signed-off-by: Thiep Ha --- configure.ac | 8 ++++++-- src/lib/ecore_input/Ecore_Input.h | 2 ++ src/lib/ecore_input/ecore_input_joystick.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2b47394..e9e29ae 100755 --- a/configure.ac +++ b/configure.ac @@ -2783,9 +2783,13 @@ EFL_PLATFORM_DEPEND([ECORE_INPUT], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina]) - +PKG_CHECK_EXISTS([libudev], + [have_ecore_udev="yes"], + [have_ecore_udev="no"]) if test "x${have_win32}" = "xno" ; then - EFL_ADD_LIBS([ECORE_INPUT], [-ludev]) +if test "${have_ecore_udev}" = "yes"; then + EFL_ADD_LIBS([ECORE_INPUT], [-ludev]) +fi fi ### Checks for header files diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h index e095a41..06886fa 100644 --- a/src/lib/ecore_input/Ecore_Input.h +++ b/src/lib/ecore_input/Ecore_Input.h @@ -469,6 +469,7 @@ extern "C" { EAPI Ecore_Compose_State ecore_compose_get(const Eina_List *seq, char **seqstr_ret); //TIZEN_ONLY(20160627) - Initial version of ecore joystick event #ifndef _WIN32 +#ifndef __APPLE__ /** * Initialises the Ecore Input Joystick system. * @since 1.15 @@ -480,6 +481,7 @@ extern "C" { */ EAPI int ecore_input_joystick_shutdown(void); #endif +#endif // #ifdef __cplusplus } diff --git a/src/lib/ecore_input/ecore_input_joystick.c b/src/lib/ecore_input/ecore_input_joystick.c index 3db1710..76d4a73 100644 --- a/src/lib/ecore_input/ecore_input_joystick.c +++ b/src/lib/ecore_input/ecore_input_joystick.c @@ -1,4 +1,5 @@ #ifndef _WIN32 +#ifndef __APPLE__ #include #include #include @@ -391,3 +392,4 @@ ecore_input_joystick_shutdown(void) return _ecore_input_joystick_init_count; } #endif +#endif -- 2.7.4