diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt old mode 100644 new mode 100755 index fb26e5739..bf25ef1a5 --- a/lib/irrlicht/CMakeLists.txt +++ b/lib/irrlicht/CMakeLists.txt @@ -1,18 +1,17 @@ # CMakeLists.txt for Irrlicht in STK - -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" - "${ZLIB_INCLUDE_DIR}") - -if(MSVC OR APPLE) - include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/" # For zconf.h on WIN32 - "${CMAKE_CURRENT_BINARY_DIR}/../libpng/") -endif() - if(NOT SERVER_ONLY) find_package(PNG REQUIRED) find_package(JPEG REQUIRED) - include_directories("${JPEG_INCLUDE_DIR}" - "${PNG_INCLUDE_DIRS}") + + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" + "${JPEG_INCLUDE_DIR}" + "${PNG_INCLUDE_DIRS}" + "${ZLIB_INCLUDE_DIR}") + + if(MSVC OR APPLE) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/" # For zconf.h on WIN32 + "${CMAKE_CURRENT_BINARY_DIR}/../libpng/") + endif() if(NOT USE_GLES2) find_package(OpenGL REQUIRED) @@ -59,6 +58,11 @@ if(NOT SERVER_ONLY) endif() endif() else() + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" + "${ZLIB_INCLUDE_DIR}") + if(MSVC OR APPLE) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/") + endif() add_definitions(-DNO_IRR_COMPILE_WITH_LIBPNG_) add_definitions(-DNO_IRR_COMPILE_WITH_LIBJPEG_) add_definitions(-DNO_IRR_COMPILE_WITH_BMP_LOADER_) @@ -619,4 +623,4 @@ endif() if(WIN32) target_link_libraries(stkirrlicht imm32 xinput9_1_0) -endif() +endif() \ No newline at end of file