diff options
| -rw-r--r-- | CMakeLists.txt | 24 | ||||
| -rw-r--r-- | config.h.in | 18 |
2 files changed, 5 insertions, 37 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 258a05af..5d274626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,13 +414,9 @@ CHECK_C_SOURCE_COMPILES("int foo(const char *str, ...) __attribute__((format(pri CHECK_INCLUDE_FILE(malloc.h HAVE_MALLOC_H) CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H) -CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H) CHECK_INCLUDE_FILE(cpuid.h HAVE_CPUID_H) CHECK_INCLUDE_FILE(intrin.h HAVE_INTRIN_H) CHECK_INCLUDE_FILE(sys/sysconf.h HAVE_SYS_SYSCONF_H) -CHECK_INCLUDE_FILE(fenv.h HAVE_FENV_H) -CHECK_INCLUDE_FILE(float.h HAVE_FLOAT_H) -CHECK_INCLUDE_FILE(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILE(guiddef.h HAVE_GUIDDEF_H) IF(NOT HAVE_GUIDDEF_H) CHECK_INCLUDE_FILE(initguid.h HAVE_INITGUID_H) @@ -505,14 +501,7 @@ IF(NOT HAVE_STRNCASECMP) ENDIF() -# Check if we have Windows headers -SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) -SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502) -CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) -SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS}) -UNSET(OLD_REQUIRED_DEFINITIONS) - -IF(NOT HAVE_WINDOWS_H) +IF(NOT WIN32) CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY) IF(NOT HAVE_GETTIMEOFDAY) MESSAGE(FATAL_ERROR "No timing function found!") @@ -606,12 +595,9 @@ ENDIF() CHECK_SYMBOL_EXISTS(getopt unistd.h HAVE_GETOPT) # Check for a 64-bit type -CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H) -IF(NOT HAVE_STDINT_H) - IF(NOT SIZEOF_LONG MATCHES "8") - IF(NOT SIZEOF_LONG_LONG MATCHES "8") - MESSAGE(FATAL_ERROR "No 64-bit types found, please report!") - ENDIF() +IF(NOT SIZEOF_LONG MATCHES "8") + IF(NOT SIZEOF_LONG_LONG MATCHES "8") + MESSAGE(FATAL_ERROR "No 64-bit type found, please report!") ENDIF() ENDIF() @@ -929,7 +915,7 @@ ENDIF() OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF) OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF) OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF) -IF(HAVE_WINDOWS_H) +IF(WIN32) SET(WINSDK_LIB_DIRS ) SET(WINSDK_INCLUDE_DIRS ) FIND_PACKAGE(WindowsSDK) diff --git a/config.h.in b/config.h.in index 5dd4311a..dbf35eda 100644 --- a/config.h.in +++ b/config.h.in @@ -92,12 +92,6 @@ /* Define if we have GCC's format attribute */ #cmakedefine HAVE_GCC_FORMAT -/* Define if we have stdint.h */ -#cmakedefine HAVE_STDINT_H - -/* Define if we have windows.h */ -#cmakedefine HAVE_WINDOWS_H - /* Define if we have dlfcn.h */ #cmakedefine HAVE_DLFCN_H @@ -110,9 +104,6 @@ /* Define if we have dirent.h */ #cmakedefine HAVE_DIRENT_H -/* Define if we have strings.h */ -#cmakedefine HAVE_STRINGS_H - /* Define if we have cpuid.h */ #cmakedefine HAVE_CPUID_H @@ -128,15 +119,6 @@ /* Define if we have initguid.h */ #cmakedefine HAVE_INITGUID_H -/* Define if we have ieeefp.h */ -#cmakedefine HAVE_IEEEFP_H - -/* Define if we have float.h */ -#cmakedefine HAVE_FLOAT_H - -/* Define if we have fenv.h */ -#cmakedefine HAVE_FENV_H - /* Define if we have GCC's __get_cpuid() */ #cmakedefine HAVE_GCC_GET_CPUID |