diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2014-04-07 00:41:17 +0400 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-04-29 01:54:05 +0200 |
| commit | 30252262ce90415f09232c51724a393c8dd6a7fe (patch) | |
| tree | 7b1585a127436ef4c88d37a877013f759c51e652 /twin | |
| parent | 394545c24c0e31d84ccb3d008c8da7c2e1f06451 (diff) | |
| download | tdebase-30252262ce90415f09232c51724a393c8dd6a7fe.tar.gz tdebase-30252262ce90415f09232c51724a393c8dd6a7fe.zip | |
Move the Xinerama test to main ConfigureChecks.cmake
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/compton-tde/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | twin/compton-tde/compton_config.h.cmake | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt index f73f09ee5..6a2d71339 100644 --- a/twin/compton-tde/CMakeLists.txt +++ b/twin/compton-tde/CMakeLists.txt @@ -31,6 +31,8 @@ include_directories( # WITH_XINNERAMA -> CONFIG_XINERAMA # WITH_OPENGL -> CONFIG_VSYNC_OPENGL # WITH_OPENGL -> CONFIG_VSYNC_OPENGL_GLSL +# WITH_OPENGL -> CONFIG_VSYNC_OPENGL_FBO +# WITH_OPENGL -> CONFIG_GLX_XSYNC # WITH_PCRE -> CONFIG_REGEX_PCRE # WITH_PCRE -> CONFIG_REGEX_PCRE_JIT # WITH_LIBCONFIG -> CONFIG_LIBCONFIG @@ -50,6 +52,8 @@ set( compton_SRCS compton.c ) if( WITH_OPENGL ) set( CONFIG_VSYNC_OPENGL ${WITH_OPENGL} ) set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} ) + set( CONFIG_VSYNC_OPENGL_FBO ${WITH_OPENGL} ) + set( CONFIG_GLX_XSYNC ${WITH_OPENGL} ) list( APPEND compton_LIBRARIES ${GL_LIBRARIES}) list( APPEND compton_SRCS opengl.c ) endif( ) diff --git a/twin/compton-tde/compton_config.h.cmake b/twin/compton-tde/compton_config.h.cmake index 91cfad3be..06db4caf4 100644 --- a/twin/compton-tde/compton_config.h.cmake +++ b/twin/compton-tde/compton_config.h.cmake @@ -6,23 +6,31 @@ // Whether to enable JIT support of libpcre. This may cause problems on PaX // kernels. #cmakedefine CONFIG_REGEX_PCRE_JIT 1 + // Whether to enable parsing of configuration files using libconfig. #cmakedefine CONFIG_LIBCONFIG 1 // Whether we are using a legacy version of libconfig (1.3.x). #cmakedefine CONFIG_LIBCONFIG_LEGACY 1 + // Whether to enable DRM VSync support #cmakedefine CONFIG_VSYNC_DRM 1 -// Whether to enable OpenGL support -#cmakedefine CONFIG_VSYNC_OPENGL 1 -// Whether to enable GLX GLSL support -#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1 -// Whether to enable GLX FBO support -#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1 + // Whether to enable DBus support with libdbus. #define CONFIG_DBUS 1 // Whether to enable condition support. #define CONFIG_C2 1 + // Whether to enable X Sync support. #define CONFIG_XSYNC 1 + +// Whether to enable OpenGL support +#cmakedefine CONFIG_VSYNC_OPENGL 1 +// Whether to enable GLX GLSL support +#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1 +// Whether to enable GLX FBO support +#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1 // Whether to enable GLX Sync support. #cmakedefine CONFIG_GLX_XSYNC 1 + +// Whether to enable Xinerama support +#cmakedefine CONFIG_XINERAMA 1 |