diff --git a/CMakeLists.txt b/CMakeLists.txt index 75208a3b82..70b8555928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,9 +67,9 @@ add_subdirectory( kcmkwin ) add_subdirectory( clients ) add_subdirectory( data ) -if( KWIN_HAVE_COMPOSITING AND NOT OPENGLES_FOUND ) +if( KWIN_HAVE_COMPOSITING ) add_subdirectory( effects ) -endif( KWIN_HAVE_COMPOSITING AND NOT OPENGLES_FOUND ) +endif( KWIN_HAVE_COMPOSITING ) ########### next target ############### diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 5f7d3e4102..6d83d1b5e9 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -66,26 +66,29 @@ include( fadedesktop/CMakeLists.txt ) include( fallapart/CMakeLists.txt ) include( highlightwindow/CMakeLists.txt ) include( login/CMakeLists.txt ) -include( logout/CMakeLists.txt ) include( magiclamp/CMakeLists.txt ) include( translucency/CMakeLists.txt ) include( minimizeanimation/CMakeLists.txt ) include( presentwindows/CMakeLists.txt ) -include( resize/CMakeLists.txt ) include( scalein/CMakeLists.txt ) -include( shadow/CMakeLists.txt ) -include( showfps/CMakeLists.txt ) -include( showpaint/CMakeLists.txt ) include( slide/CMakeLists.txt ) include( slideback/CMakeLists.txt ) include( slidingpopups/CMakeLists.txt ) include( taskbarthumbnail/CMakeLists.txt ) include( thumbnailaside/CMakeLists.txt ) include( windowgeometry/CMakeLists.txt ) + +if( NOT KWIN_HAVE_OPENGLES ) +include( resize/CMakeLists.txt ) +include( logout/CMakeLists.txt ) +include( shadow/CMakeLists.txt ) +include( showfps/CMakeLists.txt ) +include( showpaint/CMakeLists.txt ) include( zoom/CMakeLists.txt ) +endif( NOT KWIN_HAVE_OPENGLES ) # OpenGL-specific effects -if( KWIN_HAVE_OPENGL_COMPOSITING ) +if( KWIN_HAVE_OPENGL_COMPOSITING AND NOT KWIN_HAVE_OPENGLES ) include( blur/CMakeLists.txt ) include( coverswitch/CMakeLists.txt ) include( cube/CMakeLists.txt ) @@ -104,7 +107,7 @@ if( KWIN_HAVE_OPENGL_COMPOSITING ) include( startupfeedback/CMakeLists.txt ) include( trackmouse/CMakeLists.txt ) include( wobblywindows/CMakeLists.txt ) -endif( KWIN_HAVE_OPENGL_COMPOSITING ) +endif( KWIN_HAVE_OPENGL_COMPOSITING AND NOT KWIN_HAVE_OPENGLES ) ############################################################################### diff --git a/effects/configs_builtins.cpp b/effects/configs_builtins.cpp index ca3b17f948..548654b483 100644 --- a/effects/configs_builtins.cpp +++ b/effects/configs_builtins.cpp @@ -29,13 +29,17 @@ along with this program. If not, see . #include "magiclamp/magiclamp_config.h" #include "translucency/translucency_config.h" #include "presentwindows/presentwindows_config.h" +#include "thumbnailaside/thumbnailaside_config.h" + +#ifndef KWIN_HAVE_OPENGLES #include "resize/resize_config.h" #include "shadow/shadow_config.h" #include "showfps/showfps_config.h" -#include "thumbnailaside/thumbnailaside_config.h" #include "zoom/zoom_config.h" +#endif #ifdef KWIN_HAVE_OPENGL_COMPOSITING +#ifndef KWIN_HAVE_OPENGLES #include "blur/blur_config.h" #include "coverswitch/coverswitch_config.h" #include "cube/cube_config.h" @@ -50,6 +54,7 @@ along with this program. If not, see . #include "snow/snow_config.h" #include "trackmouse/trackmouse_config.h" #include "wobblywindows/wobblywindows_config.h" +#endif KWIN_HAVE_OPENGLES #endif #include @@ -67,13 +72,16 @@ KWIN_EFFECT_CONFIG_MULTIPLE( builtins, KWIN_EFFECT_CONFIG_SINGLE( magiclamp, MagicLampEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( translucency, TranslucencyEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( presentwindows, PresentWindowsEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( resize, ResizeEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig ) +#ifndef KWIN_HAVE_OPENGLES KWIN_EFFECT_CONFIG_SINGLE( shadow, ShadowEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( showfps, ShowFpsEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( resize, ResizeEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig ) +#endif #ifdef KWIN_HAVE_OPENGL_COMPOSITING +#ifndef KWIN_HAVE_OPENGLES KWIN_EFFECT_CONFIG_SINGLE( blur, BlurEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( coverswitch, CoverSwitchEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( cube, CubeEffectConfig ) @@ -88,6 +96,7 @@ KWIN_EFFECT_CONFIG_MULTIPLE( builtins, KWIN_EFFECT_CONFIG_SINGLE( snow, SnowEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( trackmouse, TrackMouseEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( wobblywindows, WobblyWindowsEffectConfig ) +#endif KWIN_HAVE_OPENGLES #endif )