From 96d9327a83bfcaa2da848a09f30284d6f5548799 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Tue, 27 May 2014 14:48:40 -0500 Subject: [PATCH] Build fontconverter and distancefieldconverter on windowless OS X. --- src/Magnum/Text/CMakeLists.txt | 5 ++++- src/Magnum/Text/fontconverter.cpp | 4 +++- src/Magnum/TextureTools/CMakeLists.txt | 5 ++++- src/Magnum/TextureTools/distancefieldconverter.cpp | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 418e4999b..131d480fd 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -67,7 +67,10 @@ if(WITH_FONTCONVERTER) add_executable(magnum-fontconverter fontconverter.cpp) - if(UNIX AND NOT TARGET_GLES) + if(APPLE) + find_library(OpenGL_LIBRARY OpenGL) + target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessCglApplication ${OpenGL_LIBRARY}) + elseif(UNIX AND NOT TARGET_GLES) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) elseif(WIN32) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessWglApplication) diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index 4f2b04db1..c5d0bed7d 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -32,7 +32,9 @@ #include "Magnum/Text/DistanceFieldGlyphCache.h" #include "Magnum/Trade/AbstractImageConverter.h" -#ifdef CORRADE_TARGET_UNIX +#ifdef __APPLE__ +#include "Magnum/Platform/WindowlessCglApplication.h" +#elif defined(CORRADE_TARGET_UNIX) #include "Magnum/Platform/WindowlessGlxApplication.h" #elif defined(CORRADE_TARGET_WINDOWS) #include "Magnum/Platform/WindowlessWglApplication.h" diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index e1e2b9318..d72b98bcb 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -56,7 +56,10 @@ if(WITH_DISTANCEFIELDCONVERTER) add_executable(magnum-distancefieldconverter distancefieldconverter.cpp) - if(UNIX AND NOT TARGET_GLES) + if(APPLE) + find_library(OpenGL_LIBRARY OpenGL) + target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessCglApplication Magnum ${OpenGL_LIBRARIES}) + elseif(UNIX AND NOT TARGET_GLES) target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) elseif(WIN32) target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessWglApplication Magnum) diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index d53f316ee..d35514467 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -37,7 +37,9 @@ #include "Magnum/Trade/AbstractImageConverter.h" #include "Magnum/Trade/ImageData.h" -#ifdef CORRADE_TARGET_UNIX +#ifdef __APPLE__ +#include "Magnum/Platform/WindowlessCglApplication.h" +#elif defined(CORRADE_TARGET_UNIX) #include "Magnum/Platform/WindowlessGlxApplication.h" #elif defined(CORRADE_TARGET_WINDOWS) #include "Magnum/Platform/WindowlessWglApplication.h"