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

Remove checks for stuff that aren't used anymore.

Browse source
This commit is contained in:
Pentarctagon 2021-03-14 20:37:49 -05:00 • committed by Pentarctagon
parent c611128112
commit 6db64459d2
3 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -339,13 +339,8 @@ if env["prereqs"]:
conf = env.Configure(**configure_args)
if env["PLATFORM"] == "posix":
conf.CheckCHeader("poll.h", "<>")
conf.CheckCHeader("sys/poll.h", "<>")
conf.CheckCHeader("sys/select.h", "<>")
if conf.CheckCHeader("sys/sendfile.h", "<>"):
conf.CheckFunc("sendfile")
conf.CheckLib("m")
conf.CheckFunc("round")
def CheckAsio(conf):
if env["PLATFORM"] == 'win32':

14
cmake/SearchForStuff.cmake
View file

@ -6,27 +6,13 @@ INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists)
#the two includes below seem to not be required, those headers are checked for
#anyway, including them here, too...
CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)
CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
#sendfile should be in one of the headers checked for here, so first check if
#one of the headers is available and then check for 'sendfile'
CHECK_INCLUDE_FILES(poll.h HAVE_POLL_H)
CHECK_INCLUDE_FILES(sys/poll.h HAVE_SYS_POLL_H)
CHECK_INCLUDE_FILES(sys/select.h HAVE_SYS_SELECT_H)
CHECK_INCLUDE_FILES(sys/sendfile.h HAVE_SYS_SENDFILE_H)
if(HAVE_SYS_SENDFILE_H)
CHECK_FUNCTION_EXISTS(sendfile HAVE_SENDFILE)
endif(HAVE_SYS_SENDFILE_H)
#in configure.ac it is not explicitly tested, if it is in 'm', instead the first
#test is if "floor" is available in m and later on it is checked if round,
#sendfile and others do exist (with the 'm' lib linked), regarding our sources
#we *only* want round from 'm'
CHECK_LIBRARY_EXISTS(m round "" HAVE_ROUND)
#use config.h.cmake to create a list of #defines comparable to the one configure
#does, this file is created in the dir where cmake is run from
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)

6
config.h.cmake
View file

@ -1,9 +1,3 @@
/*this file is used to automatically set some defines and is used in the CMake recipe*/
#cmakedefine HAVE_STDLIB_H 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_POLL_H 1
#cmakedefine HAVE_SYS_POLL_H 1
#cmakedefine HAVE_SYS_SELECT_H 1
#cmakedefine HAVE_SYS_SENDFILE_H 1
#cmakedefine HAVE_SENDFILE 1
#cmakedefine HAVE_ROUND 1