summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2012-01-14 13:21:19 -0500
committerSam Lantinga <slouken@libsdl.org>2012-01-14 13:21:19 -0500
commitd60e5f07bb4cddc1d71f080eb8c0392d1be77aac (patch)
treea5654bea0d6e2422ca2d12f5eef7d7d933585a8a /src
parent80c26a0bcbbe441157c52bc513dc9f8305728605 (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 'src')
-rwxr-xr-xsrc/SDL_assert.c1
-rwxr-xr-xsrc/atomic/SDL_atomic.c2
-rwxr-xr-xsrc/atomic/SDL_spinlock.c2
-rw-r--r--src/main/dummy/SDL_dummy_main.c1
4 files changed, 4 insertions, 2 deletions
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index c1d46bb6..97a19bc7 100755
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -18,6 +18,7 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
+#include "SDL_config.h"
#include "SDL.h"
#include "SDL_atomic.h"
diff --git a/src/atomic/SDL_atomic.c b/src/atomic/SDL_atomic.c
index 64720f4c..d8be4c89 100755
--- a/src/atomic/SDL_atomic.c
+++ b/src/atomic/SDL_atomic.c
@@ -18,7 +18,7 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
-#include "SDL_stdinc.h"
+#include "SDL_config.h"
#include "SDL_atomic.h"
diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
index 8ee96dd4..ab3c5cb3 100755
--- a/src/atomic/SDL_spinlock.c
+++ b/src/atomic/SDL_spinlock.c
@@ -18,7 +18,7 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
-#include "SDL_stdinc.h"
+#include "SDL_config.h"
#include "SDL_atomic.h"
#include "SDL_mutex.h"
diff --git a/src/main/dummy/SDL_dummy_main.c b/src/main/dummy/SDL_dummy_main.c
index e5a1351f..87955239 100644
--- a/src/main/dummy/SDL_dummy_main.c
+++ b/src/main/dummy/SDL_dummy_main.c
@@ -1,5 +1,6 @@
/* Include the SDL main definition header */
+#include "SDL_config.h"
#include "SDL_main.h"
#ifdef main