Disable requirements for OpenGL/GLEW.

wesnoth · Dec 31, 2018 · e273684 · e273684
1 parent f31b477
commit e273684
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,8 +64,8 @@ if(NOT CXX_STD)
 endif()
 
 if(ENABLE_GAME OR ENABLE_TESTS)
-	find_package(OpenGL REQUIRED)
-	find_package(GLEW REQUIRED)
+#	find_package(OpenGL REQUIRED)
+#	find_package(GLEW REQUIRED)
 	find_package(SDL2 2.0.4 REQUIRED)
 endif(ENABLE_GAME OR ENABLE_TESTS)
 

diff --git a/SConstruct b/SConstruct
@@ -387,19 +387,19 @@ if env["prereqs"]:
 
     client_env = env.Clone()
     conf = client_env.Configure(**configure_args)
-    have_client_prereqs = have_server_prereqs & have_sdl_other() & \
-        (('TRAVIS' in os.environ and os.environ["TRAVIS_OS_NAME"] == "osx") or (conf.CheckLib("vorbisfile") & \
-        conf.CheckOgg())) & \
-        conf.CheckPNG() & \
-        conf.CheckJPG() & \
-        conf.CheckOpenGL() and \
-        conf.CheckGLEW() and \
-        conf.CheckCairo(min_version = "1.10") & \
-        conf.CheckPango("cairo", require_version = "1.22.0") & \
-        conf.CheckPKG("fontconfig") & \
-        conf.CheckBoost("program_options", require_version = boost_version) & \
-        conf.CheckBoost("regex") \
-            or Warning("Client prerequisites are not met. wesnoth cannot be built")
+    have_client_prereqs = have_server_prereqs & have_sdl_other()
+    have_client_prereqs = have_client_prereqs & (('TRAVIS' in os.environ and os.environ["TRAVIS_OS_NAME"] == "osx") or (conf.CheckLib("vorbisfile") & conf.CheckOgg()))
+    have_client_prereqs = have_client_prereqs & conf.CheckPNG()
+    have_client_prereqs = have_client_prereqs & conf.CheckJPG()
+#    have_client_prereqs = have_client_prereqs & conf.CheckOpenGL()
+#    have_client_prereqs = have_client_prereqs & conf.CheckGLEW()
+    have_client_prereqs = have_client_prereqs & conf.CheckCairo(min_version = "1.10")
+    have_client_prereqs = have_client_prereqs & conf.CheckPango("cairo", require_version = "1.22.0")
+    have_client_prereqs = have_client_prereqs & conf.CheckPKG("fontconfig")
+    have_client_prereqs = have_client_prereqs & conf.CheckBoost("program_options", require_version = boost_version)
+    have_client_prereqs = have_client_prereqs & conf.CheckBoost("regex")
+    if not have_client_prereqs:
+        Warning("Client prerequisites are not met. wesnoth cannot be built.")
 
     have_X = False
     if have_client_prereqs:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(SYSTEM ${PANGOCAIRO_INCLUDE_DIRS} )
 include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR} )
 include_directories(SYSTEM ${LIBDBUS_INCLUDE_DIRS} )
 include_directories(SYSTEM ${VORBISFILE_INCLUDE_DIR} )
-include_directories(SYSTEM ${GLEW_INCLUDE_DIRS})
-include_directories(SYSTEM ${OPENGL_INCLUDE_DIR})
+#include_directories(SYSTEM ${GLEW_INCLUDE_DIRS})
+#include_directories(SYSTEM ${OPENGL_INCLUDE_DIR})
 
 include_directories(SYSTEM ${SDL2_INCLUDE_DIR} )
 set(sdl-lib ${SDL2_LIBRARY})
@@ -84,8 +84,8 @@ set(game-external-libs
 	${FONTCONFIG_LIBRARIES}
 	${LIBDBUS_LIBRARIES}
 	${VORBISFILE_LIBRARIES}
-	${OPENGL_LIBRARIES}
-	${GLEW_LIBRARIES}
+#	${OPENGL_LIBRARIES}
+#	${GLEW_LIBRARIES}
 )
 
 if(ENABLE_HISTORY AND HISTORY_FOUND)