diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-06-26 17:53:00 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-06-26 17:53:00 +0400 |
| commit | 9c44a2191755807b67a4d46b2048e6783e7ea944 (patch) | |
| tree | 11d5b531e2decbe07b230fc69594284d0be163b8 /extern/CMakeLists.txt | |
| parent | 415d457eb4776e8c44e20512be1bb15df1cdf455 (diff) | |
| parent | d4cfdc69ef95728a39f085283ba812cec856d757 (diff) | |
Merge w/ Trunk: r47143-r48302
Diffstat (limited to 'extern/CMakeLists.txt')
| -rw-r--r-- | extern/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index cf6693e0311..f65b0e7077c 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -40,7 +40,7 @@ if(WITH_BINRELOC) add_subdirectory(binreloc) endif() -if(WITH_BUILTIN_GLEW) +if(NOT WITH_SYSTEM_GLEW) if(WITH_GLES) add_subdirectory(glew-android) else() @@ -52,7 +52,7 @@ if(WITH_GAMEENGINE) add_subdirectory(recastnavigation) endif() -if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE)) +if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG)) add_subdirectory(libopenjpeg) endif() |