mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-03-10 12:01:43 +00:00
rebuilt SDL2 for windows and macosx after applying some fixes from
mainstream. some of the changes relevant to our supported targets include: - all: - SDL2 hg r11769 (SDL bug #3996) - mac: - SDL2 hg r11709 (SDL bug #3951) - SDL2 hg r11710 (SDL bug #3976) - SDL2 hg r11786 - windows: - SDL2 hg r11716 - SDL2 hg r11721 (SDL bug #3990) - SDL2 hg r11722 (SDL bug #3990) - SDL2 hg r11725 - SDL2 hg r11758 (SDL bug #3931) - SDL2 hg r11761 (SDL bug #3931) - SDL2 hg r11803 (SDL bug #4019) - SDL2 hg r11815 (SDL bug #4018) - SDL2 hg r11824 - SDL2 hg r11825 (SDL bug #4043) - SDL2 hg r11835 (SDL bug #3985) git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1555 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
a89063a5ff
commit
3e2ee378b3
5 changed files with 12 additions and 2 deletions
|
@ -121,7 +121,12 @@
|
||||||
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
|
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
|
||||||
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
||||||
#if defined(_MSC_VER) && defined(__has_include)
|
#if defined(_MSC_VER) && defined(__has_include)
|
||||||
#define HAVE_WINAPIFAMILY_H __has_include(<winapifamily.h>)
|
#if __has_include(<winapifamily.h>)
|
||||||
|
#define HAVE_WINAPIFAMILY_H 1
|
||||||
|
#else
|
||||||
|
#define HAVE_WINAPIFAMILY_H 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
|
/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
|
||||||
#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */
|
#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */
|
||||||
#define HAVE_WINAPIFAMILY_H 1
|
#define HAVE_WINAPIFAMILY_H 1
|
||||||
|
|
Binary file not shown.
|
@ -121,7 +121,12 @@
|
||||||
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
|
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
|
||||||
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
||||||
#if defined(_MSC_VER) && defined(__has_include)
|
#if defined(_MSC_VER) && defined(__has_include)
|
||||||
#define HAVE_WINAPIFAMILY_H __has_include(<winapifamily.h>)
|
#if __has_include(<winapifamily.h>)
|
||||||
|
#define HAVE_WINAPIFAMILY_H 1
|
||||||
|
#else
|
||||||
|
#define HAVE_WINAPIFAMILY_H 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
|
/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
|
||||||
#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */
|
#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_) /* _MSC_VER == 1700 for Visual Studio 2012 */
|
||||||
#define HAVE_WINAPIFAMILY_H 1
|
#define HAVE_WINAPIFAMILY_H 1
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue