pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed SDL building with the minimal configuration

Browse source
This commit is contained in:
Sam Lantinga 2013-06-13 22:10:10 -07:00
parent 5971051d9e
commit 5aa3492ef8
9 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/SDL_config.h.in
View file

@ -158,8 +158,9 @@
#undef HAVE_SEM_TIMEDWAIT
#else
/* We may need some replacement for stdarg.h here */
#include <stdarg.h>
#define HAVE_STDARG_H 1
#define HAVE_STDDEF_H 1
#define HAVE_STDINT_H 1
#endif /* HAVE_LIBC */
/* SDL internal assertion support */

12
include/SDL_config_minimal.h
View file

@ -30,10 +30,12 @@
* This is the minimal configuration that can be used to build SDL.
*/
#include <stddef.h>
#include <stdarg.h>
#define HAVE_STDARG_H 1
#define HAVE_STDDEF_H 1
#if !defined(_STDINT_H_) && !defined(_STDINT_H) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
/* Most everything except Visual Studio 2008 and earlier has stdint.h now */
#if defined(_MSC_VER) && (_MSC_VER < 1600)
/* Here are some reasonable defaults */
typedef unsigned int size_t;
typedef signed char int8_t;
typedef unsigned char uint8_t;
@ -44,7 +46,9 @@ typedef unsigned int uint32_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
typedef unsigned long uintptr_t;
#endif /* if (stdint.h isn't available) */
#else
#define HAVE_STDINT_H 1
#endif /* Visual Studio 2008 */
#ifdef __GNUC__
#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1

2
include/SDL_stdinc.h
View file

@ -359,7 +359,7 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, int val, size_t len)
extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
#if defined(__MACOSX__)
#if defined(__MACOSX__) && defined(HAVE_MEMCPY)
SDL_FORCE_INLINE void *SDL_memcpy_inline(void *dst, const void *src, size_t len)
{
/* We can count on memcpy existing on Mac OS X and being well-tuned. */