From ffc7d0919733cc3f96c37d88a3cf4796d047b4c5 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Tue, 1 Oct 2019 14:00:02 +0300 Subject: [PATCH] endpointvolume.h checks not needed since changeset 13078:8ab094a9df6b . --- CMakeLists.txt | 3 +-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 0 configure | 8 -------- configure.ac | 6 ++---- include/SDL_config.h.cmake | 1 - include/SDL_config.h.in | 9 ++++----- include/SDL_config_windows.h | 5 ++--- include/SDL_config_winrt.h | 1 - 8 files changed, 9 insertions(+), 24 deletions(-) mode change 100755 => 100644 Xcode/SDL/SDL.xcodeproj/project.pbxproj diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aecd77912235..b1c3eba040896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1294,10 +1294,9 @@ elseif(WINDOWS) set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) endif() - # headers needed elsewhere ... + # headers needed elsewhere check_include_file(mmdeviceapi.h HAVE_MMDEVICEAPI_H) check_include_file(audioclient.h HAVE_AUDIOCLIENT_H) - check_include_file(endpointvolume.h HAVE_ENDPOINTVOLUME_H) if(SDL_AUDIO) set(SDL_AUDIO_DRIVER_WINMM 1) diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj old mode 100755 new mode 100644 diff --git a/configure b/configure index 7c46e50fcdf5e..906c6193904c5 100755 --- a/configure +++ b/configure @@ -23623,14 +23623,6 @@ fi fi - ac_fn_c_check_header_mongrel "$LINENO" "endpointvolume.h" "ac_cv_header_endpointvolume_h" "$ac_includes_default" -if test "x$ac_cv_header_endpointvolume_h" = xyes; then : - $as_echo "#define HAVE_ENDPOINTVOLUME_H 1" >>confdefs.h - -fi - - - # Check whether --enable-wasapi was given. if test "${enable_wasapi+set}" = set; then : enableval=$enable_wasapi; diff --git a/configure.ac b/configure.ac index c91eafaed9ad5..4d644494d4de2 100644 --- a/configure.ac +++ b/configure.ac @@ -2291,7 +2291,7 @@ CheckOpenGLESX11() if test x$video_opengl_egl = xyes; then AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) fi - + if test x$enable_video_opengles1 = xyes; then AC_MSG_CHECKING(for OpenGL ES v1 headers) video_opengles_v1=no @@ -3021,8 +3021,6 @@ XINPUT_STATE_EX s1; AC_DEFINE(HAVE_AUDIOCLIENT_H,1,[]) fi - AC_CHECK_HEADER(endpointvolume.h,AC_DEFINE(HAVE_ENDPOINTVOLUME_H,1,[])) - AC_ARG_ENABLE(wasapi, AS_HELP_STRING([--enable-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]), , enable_wasapi=yes) @@ -3074,7 +3072,7 @@ CheckUSBHID() AC_CHECK_HEADER(libusb.h, [USB_CFLAGS="-DHAVE_LIBUSB_H"]) AC_CHECK_LIB(usb, hid_init, [USB_LIBS="$USB_LIBS -lusb"]) fi - + save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $USB_CFLAGS" diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake index df2fdc83ede84..e791aef4a0404 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake @@ -211,7 +211,6 @@ #cmakedefine HAVE_XINPUT_H @HAVE_XINPUT_H@ #cmakedefine HAVE_DXGI_H @HAVE_DXGI_H@ -#cmakedefine HAVE_ENDPOINTVOLUME_H @HAVE_ENDPOINTVOLUME_H@ #cmakedefine HAVE_MMDEVICEAPI_H @HAVE_MMDEVICEAPI_H@ #cmakedefine HAVE_AUDIOCLIENT_H @HAVE_AUDIOCLIENT_H@ diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 6d5d13ecc3f0d..c263e17d8677a 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -33,7 +33,7 @@ /* Make sure that this isn't included by Visual C++ */ #ifdef _MSC_VER -#error You should run hg revert SDL_config.h +#error You should run hg revert SDL_config.h #endif /* C language features */ @@ -192,9 +192,9 @@ #undef HAVE__EXIT #else -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 -#define HAVE_STDINT_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDDEF_H 1 +#define HAVE_STDINT_H 1 #endif /* HAVE_LIBC */ #undef HAVE_ALTIVEC_H @@ -210,7 +210,6 @@ #undef HAVE_DSOUND_H #undef HAVE_DXGI_H #undef HAVE_XINPUT_H -#undef HAVE_ENDPOINTVOLUME_H #undef HAVE_MMDEVICEAPI_H #undef HAVE_AUDIOCLIENT_H #undef HAVE_XINPUT_GAMEPAD_EX diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index 395ad7c266cc2..f8f73385ca280 100644 --- a/include/SDL_config_windows.h +++ b/include/SDL_config_windows.h @@ -84,7 +84,6 @@ typedef unsigned int uintptr_t; #define HAVE_XINPUT_H 1 #define HAVE_MMDEVICEAPI_H 1 #define HAVE_AUDIOCLIENT_H 1 -#define HAVE_ENDPOINTVOLUME_H 1 /* This is disabled by default to avoid C runtime dependencies and manifest requirements */ #ifdef HAVE_LIBC @@ -139,7 +138,7 @@ typedef unsigned int uintptr_t; #define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 #define HAVE_CEILF 1 -#define HAVE__COPYSIGN 1 +#define HAVE__COPYSIGN 1 #define HAVE_COS 1 #define HAVE_COSF 1 #define HAVE_EXP 1 @@ -168,7 +167,7 @@ typedef unsigned int uintptr_t; #define HAVE_STRTOLL 1 #define HAVE_VSSCANF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 +#define HAVE_SCALBNF 1 #endif /* This function is available with at least the VC++ 2008 C runtime library */ #if _MSC_VER >= 1400 diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h index c825c7f882dc2..8eeeb512729f8 100644 --- a/include/SDL_config_winrt.h +++ b/include/SDL_config_winrt.h @@ -100,7 +100,6 @@ typedef unsigned int uintptr_t; #define HAVE_MMDEVICEAPI_H 1 #define HAVE_AUDIOCLIENT_H 1 -#define HAVE_ENDPOINTVOLUME_H 1 #define HAVE_LIBC 1 #define STDC_HEADERS 1