Try to fix server-only build ... now non-server build is broken :(
This commit is contained in:
parent
b979d0db71
commit
39e218b2dc
@ -113,6 +113,7 @@ if(WIN32)
|
||||
set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES})
|
||||
add_definitions(-D_IRR_STATIC_LIB_)
|
||||
add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include)
|
||||
endif()
|
||||
|
||||
if(USE_GLES2)
|
||||
|
@ -1,10 +1,6 @@
|
||||
# CMakeLists.txt for Irrlicht in STK
|
||||
find_package(PNG REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
|
||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
|
||||
"${JPEG_INCLUDE_DIR}"
|
||||
"${PNG_INCLUDE_DIRS}"
|
||||
"${ZLIB_INCLUDE_DIR}")
|
||||
|
||||
if(MSVC OR APPLE)
|
||||
@ -13,6 +9,11 @@ if(MSVC OR APPLE)
|
||||
endif()
|
||||
|
||||
if(NOT SERVER_ONLY)
|
||||
find_package(PNG REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
include_directories("${JPEG_INCLUDE_DIR}"
|
||||
"${PNG_INCLUDE_DIRS}")
|
||||
|
||||
if(NOT USE_GLES2)
|
||||
find_package(OpenGL REQUIRED)
|
||||
include_directories(${OPENGL_INCLUDE_DIR})
|
||||
|
Loading…
Reference in New Issue
Block a user