Fix build issues for wayland based targets

Change-Id: Ie04cb58fcdac2c68c9e72df108c8041aed42f348
Signed-off-by: Rusty Lynch <rusty.lynch@intel.com>

diff --git a/src/wrt-client/client_submode_support.cpp b/src/wrt-client/client_submode_support.cpp
index e65718c..1e27d63 100644 (file)
--- a/src/wrt-client/client_submode_support.cpp
+++ b/src/wrt-client/client_submode_support.cpp
@@ -58,6 +58,7 @@ class SubmodeSupportImplementation
         return m_mode & mode;
     }
 
+#ifdef X11
     static Eina_Bool destoryCallback(void* data, int /*type*/, void* event)
     {
         _D("called");
@@ -72,6 +73,7 @@ class SubmodeSupportImplementation
         }
         return ECORE_CALLBACK_CANCEL;
     }
+#endif
 
   public:
     SubmodeSupportImplementation() :
@@ -119,6 +121,7 @@ class SubmodeSupportImplementation
         return false;
     }
 
+#ifdef X11
     bool transientWindow(Ecore_X_Window calleeId)
     {
         _D("called");
@@ -149,6 +152,7 @@ class SubmodeSupportImplementation
 
         return true;
     }
+#endif // X11
 };
 
 SubmodeSupport::SubmodeSupport() :
@@ -180,8 +184,10 @@ bool SubmodeSupport::isNeedTerminateOnSuspend(void)
     return m_impl->isNeedTerminateOnSuspend();
 }
 
+#ifdef X11
 bool SubmodeSupport::transientWindow(Ecore_X_Window calleeId)
 {
     return m_impl->transientWindow(calleeId);
 }
+#endif // X11
 } // namespace ClientModule

diff --git a/src/wrt-client/client_submode_support.h b/src/wrt-client/client_submode_support.h
index 4fdcf66..94c664e 100644 (file)
--- a/src/wrt-client/client_submode_support.h
+++ b/src/wrt-client/client_submode_support.h
@@ -23,7 +23,9 @@
 #define CLIENT_SUBMODE_SUPPORT_H_
 
 #include <memory>
+#ifdef X11
 #include <Ecore_X.h>
+#endif
 
 #include <dpl/wrt-dao-ro/common_dao_types.h>
 
@@ -38,10 +40,11 @@ class SubmodeSupport
     void deinitialize(void);
     bool isInlineMode(void);
     bool isNeedTerminateOnSuspend(void);
+#ifdef X11
     bool transientWindow(Ecore_X_Window win);
-
+#endif
   private:
     std::unique_ptr<SubmodeSupportImplementation> m_impl;
 };
 } // namespace ClientModule
-#endif // CLIENT_SUBMODE_SUPPORT_H_
\ No newline at end of file
+#endif // CLIENT_SUBMODE_SUPPORT_H_

diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp
index 6b63311..3a3c3ad 100644 (file)
--- a/src/wrt-client/wrt-client.cpp
+++ b/src/wrt-client/wrt-client.cpp
@@ -468,6 +468,7 @@ void WrtClient::launchStep()
     m_windowData->init();
     m_windowData->postInit();
 
+#if X11
     // sub-mode support
     if (m_submodeSupport->isInlineMode()) {
         if (m_submodeSupport->transientWindow(
@@ -479,6 +480,7 @@ void WrtClient::launchStep()
             LogWarning("Fail to set submode");
         }
     }
+#endif
     m_windowData->smartCallbackAdd(Layer::FOCUS,
                                    "focused",
                                    focusedCallback,
@@ -717,6 +719,7 @@ void WrtClient::setCtxpopupItem(void)
 void WrtClient::ctxpopupShare(void)
 {
     LogDebug("share");
+#ifdef X11
     const char* url = ewk_view_url_get(m_widget->GetCurrentWebview());
     if (!url) {
         LogError("url is empty");
@@ -734,6 +737,7 @@ void WrtClient::ctxpopupShare(void)
             "delete,request",
             &WrtClient::ExitCallback,
             this);
+#endif
 }
 
 void WrtClient::ctxpopupReload(void)
@@ -745,6 +749,7 @@ void WrtClient::ctxpopupReload(void)
 void WrtClient::ctxpopupLaunchBrowser(void)
 {
     LogDebug("launchBrowser");
+#ifdef X11
     const char* url = ewk_view_url_get(m_widget->GetCurrentWebview());
     if (!url) {
         LogError("url is empty");
@@ -758,6 +763,7 @@ void WrtClient::ctxpopupLaunchBrowser(void)
     } else {
         LogDebug("fail");
     }
+#endif
 }
 
 void WrtClient::hwkeyCallback(const std::string& key)