Removed build dependency on libslp-utilx

Removed build depenency on libslp-utilx when compiling for wayland
Added #ifdefs to stub out calls to utilx_x library for animation effects

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c437bc..51093f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ pkg_check_modules(MENU_PKGS REQUIRED
        pkgmgr
        sysman
        syspopup-caller
-       utilX
 )
 
 ADD_DEFINITIONS("-DENABLE_BGIMAGE")

diff --git a/src/layout.c b/src/layout.c
index cc5a60d..c5842c9 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -15,10 +15,14 @@
   */
 
 
+/* Set to run in wayland only */
+#define HAVE_X 0
 
 #include <Elementary.h>
 #include <Ecore_X.h>
+#if HAVE_X
 #include <utilX.h>
+#endif
 #include <vconf.h>
 
 #include "menu_screen.h"

diff --git a/src/menu_screen.c b/src/menu_screen.c
index 4d5ceec..6a08e04 100644 (file)
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -15,6 +15,8 @@
   */
 
 
+/* Set to run in wayland only */
+#define HAVE_X 0
 
 #include <Elementary.h>
 #include <Ecore_X.h>
@@ -22,7 +24,9 @@
 #include <app.h>
 #include <stdbool.h>
 #include <vconf.h>
+#if HAVE_X
 #include <utilX.h>
+#endif
 #include <aul.h>
 
 #include "conf.h"
@@ -168,7 +172,7 @@ static void _destroy_canvas(void)
 
 static int _dead_cb(int pid, void *data)
 {
-#if 0
+#if HAVE_X
        /* X Specific */
        utilx_hide_fake_effect(
                ecore_x_display_get(),
@@ -371,7 +375,7 @@ static void _resume_cb(void *data)
                _E("Failed to set memory/idle/top to 1");
        }
 
-#if 0
+#if HAVE_X
        /* X Specific */
        utilx_hide_fake_effect(
                ecore_x_display_get(),
@@ -392,7 +396,7 @@ static void _service_cb(service_h service, void *data)
                _E("Failed to set memory/idle/top to 1");
        }
 
-#if 0
+#if HAVE_X
        /* X Specific */
        utilx_hide_fake_effect(
                ecore_x_display_get(),