Browse Source

Build fontconverter and distancefieldconverter on windowless OS X.

pull/59/head
Travis Watkins 12 years ago
parent
commit
96d9327a83
  1. 5
      src/Magnum/Text/CMakeLists.txt
  2. 4
      src/Magnum/Text/fontconverter.cpp
  3. 5
      src/Magnum/TextureTools/CMakeLists.txt
  4. 4
      src/Magnum/TextureTools/distancefieldconverter.cpp

5
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)

4
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"

5
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)

4
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"

Loading…
Cancel
Save