From f05162402eacb59e68b32b7f9c541769abaf4bcb Mon Sep 17 00:00:00 2001 From: Rahul Singhal Date: Thu, 30 Jun 2011 18:12:31 +0530 Subject: [PATCH] Add missing X11 headers to X11EglImage Add missing X11 headers Xlib.h & Xutil.h to X11EglImage.h and replace X11_Xcomposite_INCLUDE_PATH with a more general X11_INCLUDE_DIR --- LayerManagerExamples/GLXApplicationExample/CMakeLists.txt | 2 +- .../Renderers/Graphic/include/TextureBinders/X11EglImage.h | 2 ++ LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt | 2 +- LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt b/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt index 24987f7..1022b33 100644 --- a/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt +++ b/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt @@ -35,7 +35,7 @@ find_package (OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) find_package(X11 REQUIRED) -include_directories(X11_Xcomposite_INCLUDE_PATH) +include_directories(X11_INCLUDE_DIR) set(LIBS ${LIBS} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} LayerManagerUtils) target_link_libraries(GLX11ApplicationExample ${LIBS} ilmClient) diff --git a/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11EglImage.h b/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11EglImage.h index 3476566..3a8aeae 100644 --- a/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11EglImage.h +++ b/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11EglImage.h @@ -21,6 +21,8 @@ #define _X11EGLIMAGE_H_ #include "TextureBinders/ITextureBinder.h" +#include "X11/Xlib.h" +#include "X11/Xutil.h" #include "X11/extensions/Xcomposite.h" #include #include diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt index baa5427..698cb68 100644 --- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt +++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt @@ -41,7 +41,7 @@ file(GLOB SOURCES add_library(X11GLXRenderer SHARED ${SOURCES}) find_package(X11 REQUIRED) -include_directories(${X11_Xcomposite_INCLUDE_PATH}) +include_directories(${X11_INCLUDE_DIR}) find_package(GLX REQUIRED) include_directories(${GLX_INCLUDE_DIR}) diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt index dcc5f2b..e11ce2c 100644 --- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt +++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt @@ -42,7 +42,7 @@ file(GLOB SOURCES add_library(X11GLESRenderer SHARED ${SOURCES}) find_package(X11 REQUIRED) -include_directories(${X11_Xcomposite_INCLUDE_PATH}) +include_directories(${X11_INCLUDE_DIR}) find_package(EGL REQUIRED) include_directories(${EGL_INCLUDE_DIR}) -- 2.7.4