From 23ca4b18219c22f7d87b65b7e6ef3a27fc9bf236 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Thu, 16 Feb 2012 12:22:05 +0100 Subject: [PATCH] Remove xf86vmode dependency --- Sources/libewol/Linux.mk | 4 ++-- Sources/libewol/ewol/base/guiX11.cpp | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index fdbde8e0..5bbb58c0 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -8,7 +8,7 @@ LOCAL_STATIC_LIBRARIES := etk libfreetype tinyxml libzip libpng LOCAL_C_INCLUDES := -I$(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -lGL -lGLU -lz -lX11 -lXxf86vm +LOCAL_EXPORT_LDLIBS := -lGL -lGLU -lz -lX11 LOCAL_CFLAGS := -D__PLATFORM__Linux \ -Wno-write-strings \ @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := \ #for freetype : https://github.com/cdave1/freetype2-android # Ewol Test Software : -LOCAL_LDLIBS := -lGL -lGLU -lz -lX11 -lXxf86vm +LOCAL_LDLIBS := -lGL -lGLU -lz -lX11 include $(BUILD_STATIC_LIBRARY) diff --git a/Sources/libewol/ewol/base/guiX11.cpp b/Sources/libewol/ewol/base/guiX11.cpp index b10cd06a..8535e7bb 100644 --- a/Sources/libewol/ewol/base/guiX11.cpp +++ b/Sources/libewol/ewol/base/guiX11.cpp @@ -36,12 +36,8 @@ #include #include #include -#include -#include -#include #include #include -#include #include @@ -158,20 +154,15 @@ bool CreateX11Context(void) EWOL_INFO("Display opened."); } int Xscreen = DefaultScreen(m_display); - { - int32_t vmMajor, vmMinor; - XF86VidModeQueryVersion(m_display, &vmMajor, &vmMinor); - EWOL_INFO("XF86 VideoMode extension version " << vmMajor << "." << vmMinor); - } // get an appropriate visual m_visual = glXChooseVisual(m_display, Xscreen, attrListDbl); if (NULL == m_visual) { m_visual = glXChooseVisual(m_display, Xscreen, attrListSgl); m_doubleBuffered = false; - EWOL_INFO("XF86 singlebuffered rendering will be used, no doublebuffering available"); + EWOL_INFO("GL-X singlebuffered rendering will be used, no doublebuffering available"); } else { m_doubleBuffered = true; - EWOL_INFO("XF86 doublebuffered rendering available"); + EWOL_INFO("GL-X doublebuffered rendering available"); } { int32_t glxMajor, glxMinor;