diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2012-01-19 01:55:51 -0500 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2012-01-19 01:55:51 -0500 |
| commit | 36f6655efe3652e05a75b65a70294b1ca5590858 (patch) | |
| tree | a68d6a0466d6ed83d7ec574b4604800a9ef0ddf3 /include | |
| parent | 3d67226719567d73c0d6317e3ad2cb7d4b6c92ec (diff) | |
Switched back to configure generating SDL_config.h
It was very confusing to have configure generate an SDL_config.h and then not have it be used when building on Mac OS X or Windows. I'll just have to remember to use SDL_config_windows.h when building official releases that are supposed to be ABI compatible with Visual Studio.
--HG--
rename : include/SDL_config_generated.h.in => include/SDL_config.h.in
Diffstat (limited to 'include')
| -rw-r--r-- | include/SDL_config.h | 9 | ||||
| -rw-r--r-- | include/SDL_config.h.in (renamed from include/SDL_config_generated.h.in) | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/include/SDL_config.h b/include/SDL_config.h index fff8014a..03ff56f5 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -40,13 +40,12 @@ #elif defined(__NINTENDODS__) #include "SDL_config_nintendods.h" #else -#ifdef MINIMAL_CONFIG_H /* This is a minimal configuration just to get SDL running on new platforms */ #include "SDL_config_minimal.h" -#else -/* This is generated by configure for your platform */ -#include "SDL_config_generated.h" -#endif #endif /* platform config */ +#ifdef USING_GENERATED_CONFIG_H +#error Wrong SDL_config.h, check your include path? +#endif + #endif /* _SDL_config_h */ diff --git a/include/SDL_config_generated.h.in b/include/SDL_config.h.in index c3f549be..0a9f4020 100644 --- a/include/SDL_config_generated.h.in +++ b/include/SDL_config.h.in @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_generated_h -#define _SDL_config_generated_h +#ifndef _SDL_config_h +#define _SDL_config_h /** * \file SDL_config.h.in @@ -297,4 +297,4 @@ #undef SDL_ASSEMBLY_ROUTINES #undef SDL_ALTIVEC_BLITTERS -#endif /* _SDL_config_generated_h */ +#endif /* _SDL_config_h */ |