From 4d3dd19b9d55ce9240ffaa628440dbe61ac599fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:55:29 +0100 Subject: [PATCH] Initial NaCl support. * Explicitly set OpenGL ES 2.0 support. * Provide information about NaCl target to users. --- CMakeLists.txt | 7 +++++++ modules/FindMagnum.cmake | 4 ++++ src/magnumConfigure.h.cmake | 1 + 3 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5713f9a8c..b0853ba78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,13 @@ endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/") +# If targetting NaCl, set explicit OpenGL ES 2.0 support +if(${CMAKE_SYSTEM_NAME} STREQUAL NaCl) + set(TARGET_GLES 1) + set(TARGET_GLES2 1) + set(MAGNUM_TARGET_NACL 1) +endif() + # Check dependencies find_package(Corrade REQUIRED) if(NOT TARGET_GLES) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 51d0311f6..24fb74479 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -80,6 +80,10 @@ string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_GLES2" _TARGET_GLES2) if(NOT _TARGET_GLES2 EQUAL -1) set(MAGNUM_TARGET_GLES2 1) endif() +string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_NACL" _TARGET_NACL) +if(NOT _TARGET_NACL EQUAL -1) + set(MAGNUM_TARGET_NACL 1) +endif() if(NOT MAGNUM_TARGET_GLES) find_package(OpenGL REQUIRED) diff --git a/src/magnumConfigure.h.cmake b/src/magnumConfigure.h.cmake index a2d1d818f..3296b3c10 100644 --- a/src/magnumConfigure.h.cmake +++ b/src/magnumConfigure.h.cmake @@ -1,3 +1,4 @@ +#cmakedefine MAGNUM_TARGET_NACL #cmakedefine MAGNUM_TARGET_GLES #cmakedefine MAGNUM_TARGET_GLES2 #cmakedefine MAGNUM_GCC46_COMPATIBILITY