diff options
| author | Denton Woods <denton.woods@gmail.com> | 2016-12-31 19:33:22 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2016-12-31 19:33:22 -0600 |
| commit | 1a72a81d44c91a7014cbb5be9729a528a38176b7 (patch) | |
| tree | 07196fc658060d1da4741df7761cd9189ab5a929 | |
| parent | 1d2e29a8fec0f0e81c346e5ada45d5f0ba813c46 (diff) | |
| download | devil-1a72a81d44c91a7014cbb5be9729a528a38176b7.tar.gz | |
- Fix for LittleCMS under Linux
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | DevIL/src-IL/src/il_profiles.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index ac710905..1d521c38 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -129,7 +129,7 @@ endif(MNG_FOUND) if(LCMS2_FOUND) option(IL_NO_LCMS "Disable LCMS support (Little CMS)" 0) #TODO: be more clever about lcms include... it smells wrong. - #option(LCMS_NODIRINCLUDE "Include lcms.h instead of lcms/lcms.h" 1) + option(LCMS_NODIRINCLUDE "Include lcms.h instead of lcms/lcms.h" 1) else(LCMS2_FOUND) set(IL_NO_LCMS 1) endif(LCMS2_FOUND) diff --git a/DevIL/src-IL/src/il_profiles.cpp b/DevIL/src-IL/src/il_profiles.cpp index 606c1faa..695f9a2c 100644 --- a/DevIL/src-IL/src/il_profiles.cpp +++ b/DevIL/src-IL/src/il_profiles.cpp @@ -20,12 +20,12 @@ #if (!defined(_WIN32) && !defined(_WIN64)) #define NON_WINDOWS 1 - #ifdef LCMS_NODIRINCLUDE + /*#ifdef LCMS_NODIRINCLUDE #include <lcms.h> #else #include <lcms/lcms.h> - #endif - + #endif*/ + #include <lcms2.h> #else #if defined(IL_USE_PRAGMA_LIBS) #if defined(_MSC_VER) || defined(__BORLANDC__) |