diff options
Diffstat (limited to 'src/openglextensions')
| -rw-r--r-- | src/openglextensions/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/openglextensions/qopenglextensions.cpp | 9 | ||||
| -rw-r--r-- | src/openglextensions/qopenglextensions.h | 10 |
3 files changed, 39 insertions, 0 deletions
diff --git a/src/openglextensions/CMakeLists.txt b/src/openglextensions/CMakeLists.txt new file mode 100644 index 0000000000..d2fc027398 --- /dev/null +++ b/src/openglextensions/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from openglextensions.pro. + +##################################################################### +## OpenGLExtensions Module: +##################################################################### + +qt_add_module(OpenGLExtensions + STATIC + SOURCES + qopenglextensions.cpp qopenglextensions.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_FOREACH + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) + +## Scopes: +##################################################################### diff --git a/src/openglextensions/qopenglextensions.cpp b/src/openglextensions/qopenglextensions.cpp index 6413ae4a78..1660181e97 100644 --- a/src/openglextensions/qopenglextensions.cpp +++ b/src/openglextensions/qopenglextensions.cpp @@ -60,6 +60,12 @@ #include "qopenglextensions.h" #include <QtGui/qopenglcontext.h> +// MemoryBarrier is a macro on some architectures on Windows +#ifdef Q_OS_WIN +#pragma push_macro("MemoryBarrier") +#undef MemoryBarrier +#endif + QT_BEGIN_NAMESPACE QAbstractOpenGLExtension::~QAbstractOpenGLExtension() @@ -7720,3 +7726,6 @@ bool QOpenGLExtension_QCOM_tiled_rendering::initializeOpenGLFunctions() QT_END_NAMESPACE +#ifdef Q_OS_WIN +#pragma pop_macro("MemoryBarrier") +#endif diff --git a/src/openglextensions/qopenglextensions.h b/src/openglextensions/qopenglextensions.h index 439e0e6530..eb473f3699 100644 --- a/src/openglextensions/qopenglextensions.h +++ b/src/openglextensions/qopenglextensions.h @@ -66,6 +66,12 @@ #include <QtGui/qopengl.h> +// MemoryBarrier is a macro on some architectures on Windows +#ifdef Q_OS_WIN +#pragma push_macro("MemoryBarrier") +#undef MemoryBarrier +#endif + QT_BEGIN_NAMESPACE class QOpenGLContext; @@ -19473,6 +19479,10 @@ inline void QOpenGLExtension_QCOM_tiled_rendering::glEndTilingQCOM(GLbitfield pr QT_END_NAMESPACE +#ifdef Q_OS_WIN +#pragma pop_macro("MemoryBarrier") +#endif + #endif // QT_NO_OPENGL #endif |