diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2012-01-14 13:21:19 -0500 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2012-01-14 13:21:19 -0500 |
| commit | d60e5f07bb4cddc1d71f080eb8c0392d1be77aac (patch) | |
| tree | a5654bea0d6e2422ca2d12f5eef7d7d933585a8a /include | |
| parent | 80c26a0bcbbe441157c52bc513dc9f8305728605 (diff) | |
Make sure that we use consistent configuration options on platforms like Windows so that command line builds and IDE builds have ABI compatibility.
Make sure we don't clobber SDL_revision.h when building from Mercurial
--HG--
rename : include/SDL_config.h.in => include/SDL_config_generated.h.in
Diffstat (limited to 'include')
| -rw-r--r-- | include/SDL_config.h | 8 | ||||
| -rw-r--r-- | include/SDL_config_generated.h.in (renamed from include/SDL_config.h.in) | 0 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/SDL_config.h b/include/SDL_config.h index bbeb6631..fff8014a 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -26,8 +26,6 @@ /** * \file SDL_config.h - * - * SDL_config.h for any platform that doesn't build using the configure system. */ /* Add any platform that doesn't build using the configure system. */ @@ -42,7 +40,13 @@ #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 */ #endif /* _SDL_config_h */ diff --git a/include/SDL_config.h.in b/include/SDL_config_generated.h.in index 78b04b52..78b04b52 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config_generated.h.in |