GLXRenderer: Fix dependency to the new config file location

- Removing config specific attributes in XWindowSystem.h file.
  No dependency of the build configuration is allowed in header
  files which are needed to link against a development library

diff --git a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
index befc375..24f13df 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
+++ b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
@@ -124,10 +124,8 @@ private:
     static int error(Display *dpy, XErrorEvent *ev);
 
     static bool m_xerror;
-    #ifdef WITH_INPUT_EVENTS
     void ManageXInputEvent(XEvent *pevent);
-    #endif
-    
+   
     friend void * X11eventLoopCallback(void *);
 };
 

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
index 88a2650..d62e4ad 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
@@ -893,9 +893,9 @@ init_complete:
 }
 
 
-#ifdef WITH_INPUT_EVENTS
 void X11WindowSystem::ManageXInputEvent(XEvent *pevent)
 {
+#ifdef WITH_INPUT_EVENTS
     Surface * surf;
     int *pX, *pY;
 
@@ -921,8 +921,8 @@ void X11WindowSystem::ManageXInputEvent(XEvent *pevent)
         pevent->xany.window = surf->getNativeContent();
         XSendEvent(x11Display, pevent->xany.window, false, 0, pevent);
     }
-}
 #endif
+}
 
 
 #ifdef WITH_XTHREADS

diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
index bb2755d..69c5f0d 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License. 
 # You may obtain a copy of the License at 
 #
-#              http://www.apache.org/licenses/LICENSE-2.0 
+#       http://www.apache.org/licenses/LICENSE-2.0 
 #
 # Unless required by applicable law or agreed to in writing, software 
 # distributed under the License is distributed on an "AS IS" BASIS, 
@@ -22,7 +22,7 @@ cmake_minimum_required (VERSION 2.6)
 include_directories ("include")
 include_directories ("../../Base/include")
 include_directories ("../../Graphic/include")
-
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/bin")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")