Cherry picked commits from old pi branch (which was based on dumb client).

CMakeLists.txt

@@ -15,6 +15,7 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "STKRelease")
 endif()
 
+option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
@@ -34,7 +35,7 @@ else()
     set(WIIUSE_BUILD ON)
 endif()
 
-if(MINGW OR CYGWIN)
+if(MINGW OR CYGWIN OR SERVER_ONLY)
     option(USE_WIIUSE "Support for wiimote input devices" OFF)
 else()
     option(USE_WIIUSE "Support for wiimote input devices" ON)
@@ -67,6 +68,10 @@ if(USE_GLES2)
     add_definitions(-DUSE_GLES2)
 endif()
 
+if(SERVER_ONLY)
+    add_definitions(-DSERVER_ONLY)
+endif()
+
 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
@@ -76,7 +81,7 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
 
 # Build glew library
-if(NOT USE_GLES2)
+if(NOT USE_GLES2 AND NOT SERVER_ONLY)
     add_definitions(-DGLEW_NO_GLU)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
     include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
@@ -205,12 +210,13 @@ if (OPENMP_FOUND)
 endif()
 
 # OpenGL
-if(NOT USE_GLES2)
+if(NOT USE_GLES2 AND NOT SERVER_ONLY)
     find_package(OpenGL REQUIRED)
     include_directories(${OPENGL_INCLUDE_DIR})
 endif()
 
-if(UNIX AND NOT APPLE)
+
+if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
     find_package(X11 REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
 

lib/glew/CMakeLists.txt

@@ -1,5 +1,6 @@
 # CMakeLists.txt - glew
 
+if (NOT SERVER_ONLY)
 include_directories("include")
 
 if(APPLE)
@@ -18,3 +19,5 @@ add_library(glew STATIC
 )
 
 target_link_libraries(glew ${OPENGL_LIBRARIES})
+
+endif()

lib/irrlicht/CMakeLists.txt

@@ -8,9 +8,14 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
                     "${ZLIB_INCLUDE_DIR}"
                     "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
 
-if(NOT USE_GLES2)
+if (SERVER_ONLY)
-    find_package(OpenGL REQUIRED)
+    add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
-    include_directories(${OPENGL_INCLUDE_DIR})
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
+else()
+    if(NOT USE_GLES2)
+        find_package(OpenGL REQUIRED)
+        include_directories(${OPENGL_INCLUDE_DIR})
+    endif()
 endif()
 
 if (UNIX AND NOT APPLE)

lib/irrlicht/include/IrrCompileConfig.h

@@ -248,6 +248,10 @@ define out. */
 #ifdef NO_IRR_LINUX_XCURSOR_
 #undef _IRR_LINUX_XCURSOR_
 #endif
+#else
+
+#undef _IRR_LINUX_X11_VIDMODE_
+#undef _IRR_LINUX_X11_RANDR_
 
 #endif
 

lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp

@@ -68,6 +68,7 @@ namespace irr
 	}
 } // end namespace irr
 
+#if defined(_IRR_COMPILE_WITH_X11_)
 namespace
 {
 	Atom X_ATOM_CLIPBOARD;
@@ -75,6 +76,7 @@ namespace
 	Atom X_ATOM_UTF8_STRING;
 	Atom X_ATOM_TEXT;
 };
+#endif
 
 namespace irr
 {
@@ -596,6 +598,8 @@ static GLXContext getMeAGLContext(Display *display, GLXFBConfig glxFBConfig, boo
 }
 #endif
 
+#endif
+
 bool CIrrDeviceLinux::createWindow()
 {
 #ifdef _IRR_COMPILE_WITH_X11_

src/graphics/irr_driver.cpp

@@ -71,11 +71,13 @@
  * Should help prevent distros building against an incompatible library.
  */
 
-#if (IRRLICHT_VERSION_MAJOR < 1 || IRRLICHT_VERSION_MINOR < 7 || \
+#if (  IRRLICHT_VERSION_MAJOR < 1                   || \
-    _IRR_MATERIAL_MAX_TEXTURES_ < 8 || \
+       IRRLICHT_VERSION_MINOR < 7                   || \
-    (!defined(_IRR_COMPILE_WITH_OPENGL_) && \
+      _IRR_MATERIAL_MAX_TEXTURES_ < 8               || \
-     !defined(_IRR_COMPILE_WITH_OGLES2_)) || \
+      ( !defined(_IRR_COMPILE_WITH_OPENGL_) &&         \
-    !defined(_IRR_COMPILE_WITH_B3D_LOADER_))
+        !defined(SERVER_ONLY) )             &&         \
+        !defined(_IRR_COMPILE_WITH_OGLES2_)       ) || \
+      !defined(_IRR_COMPILE_WITH_B3D_LOADER_))
 #error "Building against an incompatible Irrlicht. Distros, \
 please use the included version."
 #endif