Remove XLib dependency from kwinglobals
As a side effect we need some fixx11h.h includes at places which still use too much xlib.
This commit is contained in:
parent
8a78e71c97
commit
5e29cc24dc
4 changed files with 3 additions and 8 deletions
1
atoms.h
1
atoms.h
|
@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
#include <fixx11h.h>
|
||||||
|
|
||||||
namespace KWin
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
1
group.h
1
group.h
|
@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
|
#include <fixx11h.h>
|
||||||
#include <netwm.h>
|
#include <netwm.h>
|
||||||
|
|
||||||
namespace KWin
|
namespace KWin
|
||||||
|
|
|
@ -18,10 +18,6 @@ set(kwineffects_KDE_LIBS
|
||||||
KF5::XmlGui # needed for KShortcutEditor
|
KF5::XmlGui # needed for KShortcutEditor
|
||||||
)
|
)
|
||||||
|
|
||||||
set(kwineffects_XLIB_LIBS
|
|
||||||
${X11_X11_LIB}
|
|
||||||
)
|
|
||||||
|
|
||||||
set(kwineffects_XCB_LIBS
|
set(kwineffects_XCB_LIBS
|
||||||
${XCB_XCB_LIBRARIES}
|
${XCB_XCB_LIBRARIES}
|
||||||
${XCB_XFIXES_LIBRARIES}
|
${XCB_XFIXES_LIBRARIES}
|
||||||
|
@ -32,7 +28,6 @@ kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
|
||||||
target_link_libraries(kwineffects
|
target_link_libraries(kwineffects
|
||||||
${kwineffects_QT_LIBS}
|
${kwineffects_QT_LIBS}
|
||||||
${kwineffects_KDE_LIBS}
|
${kwineffects_KDE_LIBS}
|
||||||
${kwineffects_XLIB_LIBS}
|
|
||||||
${kwineffects_XCB_LIBS}
|
${kwineffects_XCB_LIBS}
|
||||||
)
|
)
|
||||||
set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
|
set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
|
||||||
|
@ -55,7 +50,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
|
||||||
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
|
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
|
||||||
endif()
|
endif()
|
||||||
kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
|
kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
|
||||||
target_link_libraries(${name} ${kwineffects_QT_LIBS} ${kwineffects_XLIB_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
|
target_link_libraries(${name} ${kwineffects_QT_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
|
||||||
if(OPENGL_EGL_FOUND)
|
if(OPENGL_EGL_FOUND)
|
||||||
target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
|
target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -25,8 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include <kdemacros.h>
|
#include <kdemacros.h>
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <fixx11h.h>
|
|
||||||
#include <xcb/xcb.h>
|
#include <xcb/xcb.h>
|
||||||
|
|
||||||
#include <kwinconfig.h>
|
#include <kwinconfig.h>
|
||||||
|
|
Loading…
Reference in a new issue