From 0f2e500abddd9f5642218a35185b9595e9bf69a5 Mon Sep 17 00:00:00 2001 From: Andriy Rysin Date: Mon, 27 Dec 2010 19:12:37 +0000 Subject: [PATCH] Allow kdelibs/kdebase compile without glu library (review 6213) svn path=/trunk/KDE/kdebase/workspace/; revision=1209642 --- compositingprefs.cpp | 2 ++ options.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/compositingprefs.cpp b/compositingprefs.cpp index bb3b7b9d3c..2341f13337 100644 --- a/compositingprefs.cpp +++ b/compositingprefs.cpp @@ -241,6 +241,7 @@ void CompositingPrefs::detectDriverAndVersion() // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work. void CompositingPrefs::applyDriverSpecificOptions() { +#ifdef KWIN_HAVE_OPENGL_COMPOSITING // Always recommend mRecommendCompositing = true; @@ -248,6 +249,7 @@ void CompositingPrefs::applyDriverSpecificOptions() mStrictBinding = !gl->supports( LooseBinding ); if ( gl->driver() == Driver_Intel ) mEnableVSync = false; +#endif } diff --git a/options.cpp b/options.cpp index 687aece7a4..117765e90b 100644 --- a/options.cpp +++ b/options.cpp @@ -57,6 +57,7 @@ int currentRefreshRate() int rate = -1; if( options->refreshRate > 0 ) // use manually configured refresh rate rate = options->refreshRate; +#ifdef KWIN_HAVE_OPENGL_COMPOSITING else if ( GLPlatform::instance()->driver() == Driver_NVidia ) { QProcess nvidia_settings; @@ -73,6 +74,7 @@ int currentRefreshRate() rate = qRound(frate); } } +#endif #ifdef HAVE_XRANDR else if( Extensions::randrAvailable() ) {