mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-09 11:26:29 +00:00
windows: replace shobjidl_core.h usage with shobjidl.h except for when targeting xbox
Closes https://github.com/libsdl-org/SDL/pull/13571
This commit is contained in:

committed by
Sam Lantinga

parent
1c5c3b1479
commit
f241e8e8fd
@@ -229,7 +229,6 @@
|
||||
#cmakedefine HAVE_TPCSHRD_H 1
|
||||
#cmakedefine HAVE_ROAPI_H 1
|
||||
#cmakedefine HAVE_SHELLSCALINGAPI_H 1
|
||||
#cmakedefine HAVE_SHOBJIDL_CORE_H 1
|
||||
|
||||
#cmakedefine USE_POSIX_SPAWN 1
|
||||
#cmakedefine HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1
|
||||
|
@@ -95,9 +95,6 @@ typedef unsigned int uintptr_t;
|
||||
#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0603 /* Windows 8.1 SDK */
|
||||
#define HAVE_SHELLSCALINGAPI_H 1
|
||||
#endif
|
||||
#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0601 /* Windows 7 SDK */
|
||||
#define HAVE_SHOBJIDL_CORE_H 1
|
||||
#endif
|
||||
#define HAVE_MMDEVICEAPI_H 1
|
||||
#define HAVE_AUDIOCLIENT_H 1
|
||||
#define HAVE_TPCSHRD_H 1
|
||||
|
@@ -43,7 +43,6 @@
|
||||
#define HAVE_D3D11_H 1
|
||||
#define HAVE_ROAPI_H 1
|
||||
#define HAVE_SHELLSCALINGAPI_H 1
|
||||
#define HAVE_SHOBJIDL_CORE_H 1
|
||||
#define HAVE_MMDEVICEAPI_H 1
|
||||
#define HAVE_AUDIOCLIENT_H 1
|
||||
#define HAVE_TPCSHRD_H 1
|
||||
@@ -146,7 +145,7 @@
|
||||
#define HAVE_TRUNC 1
|
||||
#define HAVE_TRUNCF 1
|
||||
#define HAVE__FSEEKI64 1
|
||||
#endif /* _MSC_VER */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Enable various audio drivers */
|
||||
#if defined(HAVE_MMDEVICEAPI_H) && defined(HAVE_AUDIOCLIENT_H)
|
||||
|
@@ -41,7 +41,6 @@
|
||||
/*#define HAVE_WINDOWS_GAMING_INPUT_H 1*/
|
||||
/*#define HAVE_ROAPI_H 1*/
|
||||
/*#define HAVE_SHELLSCALINGAPI_H 1*/
|
||||
/*#define HAVE_SHOBJIDL_CORE_H 1*/
|
||||
#define HAVE_MMDEVICEAPI_H 1
|
||||
#define HAVE_AUDIOCLIENT_H 1
|
||||
/*#define HAVE_TPCSHRD_H 1*/
|
||||
@@ -145,7 +144,7 @@
|
||||
#define HAVE_TRUNC 1
|
||||
#define HAVE_TRUNCF 1
|
||||
#define HAVE__FSEEKI64 1
|
||||
#endif /* _MSC_VER */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Enable various audio drivers */
|
||||
#if defined(HAVE_MMDEVICEAPI_H) && defined(HAVE_AUDIOCLIENT_H)
|
||||
|
Reference in New Issue
Block a user