From ffb868cbe1447aaf3528bfb3c9927aa5daaf695c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Aug 2014 00:25:15 +0200 Subject: [PATCH] Platform: fix compilation of GLX applications on ES. --- src/Magnum/Platform/CMakeLists.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 88018dfe3..28b59013d 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -190,13 +190,17 @@ endif() if(WITH_GLXAPPLICATION) set(NEED_ABSTRACTXAPPLICATION 1) set(NEED_GLXCONTEXTHANDLER 1) - set(NEED_GLXCONTEXT 1) + if(NOT MAGNUM_TARGET_GLES) + set(NEED_GLXCONTEXT 1) + endif() set(MagnumGlxApplication_SRCS GlxApplication.cpp $ - $ - $) + $) + if(NOT MAGNUM_TARGET_GLES) + list(APPEND MagnumWindowlessGlxApplication_SRCS $) + endif() set(MagnumGlxApplication_HEADERS GlxApplication.h) add_library(MagnumGlxApplication STATIC @@ -241,11 +245,14 @@ endif() # Windowless GLX application if(WITH_WINDOWLESSGLXAPPLICATION) - set(NEED_GLXCONTEXT 1) + if(NOT MAGNUM_TARGET_GLES) + set(NEED_GLXCONTEXT 1) + endif() - set(MagnumWindowlessGlxApplication_SRCS - WindowlessGlxApplication.cpp - $) + set(MagnumWindowlessGlxApplication_SRCS WindowlessGlxApplication.cpp) + if(NOT MAGNUM_TARGET_GLES) + list(APPEND MagnumWindowlessGlxApplication_SRCS $) + endif() set(MagnumWindowlessGlxApplication_HEADERS WindowlessGlxApplication.h) add_library(MagnumWindowlessGlxApplication STATIC