mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try fixing Jenkins build

Browse Source
This commit is contained in:
Alexander Bock
2014-12-06 01:29:54 +01:00
parent 4ffb5cb0d3
commit bf08b075a4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -68,6 +68,12 @@ include_directories("${GHOUL_ROOT_DIR}/include")
set(BOOST_ROOT "${GHOUL_ROOT_DIR}/ext/boost")
add_subdirectory(${GHOUL_ROOT_DIR})
set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Ghoul)
if (GHOUL_USE_FREEIMAGE)
add_definitions(-DGHOUL_USE_FREEIMAGE)
endif ()
if (GHOUL_USE_DEVIL)
add_definitions(-DGHOUL_USE_DEVIL)
endif ()
# Add ghoul ext
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${GHOUL_ROOT_DIR}/ext)

10
src/rendering/renderengine.cpp
View File

@@ -45,9 +45,10 @@
#include <ghoul/io/texture/texturereader.h>
#ifdef GHOUL_USE_DEVIL
#include <ghoul/io/texture/texturereaderdevil.h>
#else
#endif //GHOUL_USE_DEVIL
#ifdef GHOUL_USE_FREEIMAGE
#include <ghoul/io/texture/texturereaderfreeimage.h>
#endif // GHOUL_USE_DEVIL
#endif // GHOUL_USE_FREEIMAGE
#include <ghoul/io/texture/texturereadercmap.h>
#include <array>
@@ -138,9 +139,10 @@ bool RenderEngine::initialize()
#ifdef GHOUL_USE_DEVIL
ghoul::io::TextureReader::addReader(new ghoul::io::impl::TextureReaderDevIL);
#else
ghoul::io::TextureReader::addReader(new ghoul::io::impl::TextureReaderFreeImage);
#endif // GHOUL_USE_DEVIL
#ifdef GHOUL_USE_FREEIMAGE
ghoul::io::TextureReader::addReader(new ghoul::io::impl::TextureReaderFreeImage);
#endif // GHOUL_USE_FREEIMAGE
ghoul::io::TextureReader::addReader(new ghoul::io::impl::TextureReaderCMAP);