Commit 94754c39686ab128e1ddac7baebf267c3289dc22
2017-02-20T10:55:33
Updated config headers to override the base SDL_config.h if both are included
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h
index a7090d1..32fa96c 100644
--- a/include/SDL_config_android.h
+++ b/include/SDL_config_android.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_android_h_
#define SDL_config_android_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
index ccc1c36..7d5af2c 100644
--- a/include/SDL_config_iphoneos.h
+++ b/include/SDL_config_iphoneos.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_iphoneos_h_
#define SDL_config_iphoneos_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index e439d98..4b29f62 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_macosx_h_
#define SDL_config_macosx_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h
index 7b3e68b..3112700 100644
--- a/include/SDL_config_minimal.h
+++ b/include/SDL_config_minimal.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_minimal_h_
#define SDL_config_minimal_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index 02be3c6..ea62fe5 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -19,7 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#ifndef SDL_config_h_
+#ifndef SDL_config_pandora_h_
+#define SDL_config_pandora_h_
#define SDL_config_h_
/* This is a set of defines to configure the SDL features */
@@ -124,4 +125,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1
-#endif /* SDL_config_h_ */
+#endif /* SDL_config_pandora_h_ */
diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h
index d0109c9..28efb4c 100644
--- a/include/SDL_config_psp.h
+++ b/include/SDL_config_psp.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_psp_h_
#define SDL_config_psp_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h
index 2c25791..007e11c 100644
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_windows_h_
#define SDL_config_windows_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
index a9a8345..24f9e17 100644
--- a/include/SDL_config_winrt.h
+++ b/include/SDL_config_winrt.h
@@ -21,6 +21,7 @@
#ifndef SDL_config_winrt_h_
#define SDL_config_winrt_h_
+#define SDL_config_h_
#include "SDL_platform.h"
diff --git a/include/SDL_config_wiz.h b/include/SDL_config_wiz.h
index 9e1de38..5bb845a 100644
--- a/include/SDL_config_wiz.h
+++ b/include/SDL_config_wiz.h
@@ -19,7 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#ifndef SDL_config_h_
+#ifndef SDL_config_wiz_h_
+#define SDL_config_wiz_h_
#define SDL_config_h_
/* This is a set of defines to configure the SDL features */
@@ -117,4 +118,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1
-#endif /* SDL_config_h_ */
+#endif /* SDL_config_wiz_h_ */