ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix server-only build ... now non-server build is broken :(

Browse Source
This commit is contained in:
hiker 2018-07-23 09:28:12 +10:00
parent b979d0db71
commit 39e218b2dc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -113,6 +113,7 @@ if(WIN32)
set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}) set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES})
add_definitions(-D_IRR_STATIC_LIB_) add_definitions(-D_IRR_STATIC_LIB_)
add_definitions(-DNO_IRR_COMPILE_WITH_X11_) add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
include_directories(${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include)
endif() endif()
if(USE_GLES2) if(USE_GLES2)

9
lib/irrlicht/CMakeLists.txt
View File

@ -1,10 +1,6 @@
# CMakeLists.txt for Irrlicht in STK # CMakeLists.txt for Irrlicht in STK
find_package(PNG REQUIRED)
find_package(JPEG REQUIRED)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
"${JPEG_INCLUDE_DIR}"
"${PNG_INCLUDE_DIRS}"
"${ZLIB_INCLUDE_DIR}") "${ZLIB_INCLUDE_DIR}")
if(MSVC OR APPLE) if(MSVC OR APPLE)
@ -13,6 +9,11 @@ if(MSVC OR APPLE)
endif() endif()
if(NOT SERVER_ONLY) if(NOT SERVER_ONLY)
find_package(PNG REQUIRED)
find_package(JPEG REQUIRED)
include_directories("${JPEG_INCLUDE_DIR}"
"${PNG_INCLUDE_DIRS}")
if(NOT USE_GLES2) if(NOT USE_GLES2)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})