yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove KWIN_HAVE_OPENGL from kwingl(es)utils

Browse source 
Yes building an OpenGL support library requires OpenGL...
This commit is contained in:
Martin Gräßlin 2011-08-13 16:22:13 +02:00
parent 0c47ca5e97
commit f5a187d224
9 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libkwineffects/CMakeLists.txt
View file

@ -36,11 +36,10 @@ if(OPENGL_FOUND OR OPENGLES_FOUND)
if(OPENGLES_FOUND) if(OPENGLES_FOUND)
KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES}) KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES") set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
endif(OPENGLES_FOUND) endif(OPENGLES_FOUND)
if(OPENGL_FOUND) if(OPENGL_FOUND)
KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY}) KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
set_target_properties(kwinglutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY}) target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY}) target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})

4
libkwineffects/kwinglplatform.cpp
View file

@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iomanip> #include <iomanip>
#include <ios> #include <ios>
#ifdef KWIN_HAVE_OPENGL
namespace KWin namespace KWin
{ {
@ -878,5 +876,3 @@ bool GLPlatform::isSoftwareEmulation() const
} // namespace KWin } // namespace KWin
#endif // KWIN_HAVE_OPENGL

4
libkwineffects/kwinglplatform.h
View file

@ -21,9 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_GLPLATFORM_H #ifndef KWIN_GLPLATFORM_H
#define KWIN_GLPLATFORM_H #define KWIN_GLPLATFORM_H
#include <kwinconfig.h> // KWIN_HAVE_OPENGL
#ifdef KWIN_HAVE_OPENGL
#include <kwinglutils_funcs.h> #include <kwinglutils_funcs.h>
#include <QSet> #include <QSet>
@ -282,6 +279,5 @@ inline GLPlatform *GLPlatform::instance()
} // namespace KWin } // namespace KWin
#endif // KWIN_HAVE_OPENGL
#endif // KWIN_GLPLATFORM_H #endif // KWIN_GLPLATFORM_H

4
libkwineffects/kwingltexture.cpp
View file

@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "kwinconfig.h" // KWIN_HAVE_OPENGL #include "kwinconfig.h" // KWIN_HAVE_OPENGL
#ifdef KWIN_HAVE_OPENGL
#include "kwinglplatform.h" #include "kwinglplatform.h"
#include "kwineffects.h" #include "kwineffects.h"
#include "kwinglutils_funcs.h" #include "kwinglutils_funcs.h"
@ -416,5 +414,3 @@ bool GLTexture::isYInverted() const
} }
} // namespace KWin } // namespace KWin
#endif

6
libkwineffects/kwingltexture.h
View file

@ -22,11 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_GLTEXTURE_H #ifndef KWIN_GLTEXTURE_H
#define KWIN_GLTEXTURE_H #define KWIN_GLTEXTURE_H
#include "kwinconfig.h" // KWIN_HAVE_OPENGL
#include "kwinglobals.h" #include "kwinglobals.h"
#ifdef KWIN_HAVE_OPENGL
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
@ -122,9 +119,6 @@ private:
} // namespace } // namespace
#endif
/** @} */ /** @} */
#endif #endif

3
libkwineffects/kwinglutils.cpp
View file

@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "kwinglutils.h" #include "kwinglutils.h"
#ifdef KWIN_HAVE_OPENGL
#include "kwinglobals.h" #include "kwinglobals.h"
#include "kwineffects.h" #include "kwineffects.h"
#include "kwinglplatform.h" #include "kwinglplatform.h"
@ -1290,5 +1289,3 @@ GLVertexBuffer *GLVertexBuffer::streamingBuffer()
} }
} // namespace } // namespace
#endif

5
libkwineffects/kwinglutils.h
View file

@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_GLUTILS_H #ifndef KWIN_GLUTILS_H
#define KWIN_GLUTILS_H #define KWIN_GLUTILS_H
#include <kwinconfig.h> // KWIN_HAVE_OPENGL
#ifdef KWIN_HAVE_OPENGL
#include <kwinglutils_funcs.h> #include <kwinglutils_funcs.h>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
@ -537,8 +534,6 @@ private:
} // namespace } // namespace
#endif
/** @} */ /** @} */
#endif #endif

2
libkwineffects/kwinglutils_funcs.cpp
View file

@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
if ( !function ) \ if ( !function ) \
function = (function ## _func)getProcAddress( #backup ); function = (function ## _func)getProcAddress( #backup );
#ifdef KWIN_HAVE_OPENGL
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
namespace KWin namespace KWin
@ -316,4 +315,3 @@ void glResolveFunctions()
} // namespace } // namespace
#endif #endif
#endif

6
libkwineffects/kwinglutils_funcs.h
View file

@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KWIN_EXPORT KDE_EXPORT #define KWIN_EXPORT KDE_EXPORT
#include <kwinconfig.h> // KWIN_HAVE_OPENGL
#ifdef KWIN_HAVE_OPENGL
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
// gcc-3.3.3 apparently cannot resolve KWin's namespaced versions properly, // gcc-3.3.3 apparently cannot resolve KWin's namespaced versions properly,
@ -404,5 +400,3 @@ extern KWIN_EXPORT glEGLImageTargetTexture2DOES_func glEGLImageTargetTexture2DOE
#endif #endif
#endif #endif
#endif