Merge branch 'fix-serveronly-build'

hiker · hiker · commit bda6c546d0a9 · 2018-07-23T13:53:10.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
@@ -1,18 +1,18 @@
 # CMakeLists.txt for Irrlicht in STK
-find_package(PNG REQUIRED)
-find_package(JPEG REQUIRED)
+if(NOT SERVER_ONLY)
+    find_package(PNG REQUIRED)
+    find_package(JPEG REQUIRED)
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
-                    "${JPEG_INCLUDE_DIR}"
-                    "${PNG_INCLUDE_DIRS}"
-                    "${ZLIB_INCLUDE_DIR}")
+    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(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)
     if(NOT USE_GLES2)
         find_package(OpenGL REQUIRED)
         include_directories(${OPENGL_INCLUDE_DIR})
@@ -58,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_)
@@ -618,4 +623,4 @@ endif()
 
 if(WIN32)
     target_link_libraries(stkirrlicht imm32 xinput9_1_0)
-endif()
+endif()
