diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d3a94f807..bf554d97e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 9317b0e550..de6851fc9f 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -45,9 +45,10 @@ #include #ifdef GHOUL_USE_DEVIL #include -#else +#endif //GHOUL_USE_DEVIL +#ifdef GHOUL_USE_FREEIMAGE #include -#endif // GHOUL_USE_DEVIL +#endif // GHOUL_USE_FREEIMAGE #include #include @@ -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);