0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable requirements for OpenGL/GLEW.

Browse source
This commit is contained in:
pentarctagon 2018-12-31 13:17:37 -06:00
parent f31b477e5b
commit e273684f66
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -64,8 +64,8 @@ if(NOT CXX_STD)
endif() endif()
if(ENABLE_GAME OR ENABLE_TESTS) if(ENABLE_GAME OR ENABLE_TESTS)
find_package(OpenGL REQUIRED) # find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) # find_package(GLEW REQUIRED)
find_package(SDL2 2.0.4 REQUIRED) find_package(SDL2 2.0.4 REQUIRED)
endif(ENABLE_GAME OR ENABLE_TESTS) endif(ENABLE_GAME OR ENABLE_TESTS)

26
SConstruct
View file

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

8
src/CMakeLists.txt
View file

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