Allow configure to override assertion settings, but by default this comes from the build optimization level.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404405

8 files changed, 4 insertions, 23 deletions

diff --git a/include/SDL_assert.h b/include/SDL_assert.h
index 9cff3dfe..de4dd864 100644
--- a/include/SDL_assert.h
+++ b/include/SDL_assert.h
@@ -25,8 +25,10 @@
 #define _SDL_assert_h
 
 #ifndef SDL_ASSERT_LEVEL
-#if defined(_DEBUG) || defined(DEBUG) || \
-    (defined(__GNUC__) && !defined(__OPTIMIZE__))
+#ifdef SDL_DEFAULT_ASSERT_LEVEL
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
+#elif defined(_DEBUG) || defined(DEBUG) || \
+      (defined(__GNUC__) && !defined(__OPTIMIZE__))
 #define SDL_ASSERT_LEVEL 2
 #else
 #define SDL_ASSERT_LEVEL 1
diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
index 288b18c8..9248c3c1 100644
--- a/include/SDL_config_iphoneos.h
+++ b/include/SDL_config_iphoneos.h
@@ -25,9 +25,6 @@
 
 #include "SDL_platform.h"
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index 194cbc83..be44f332 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -28,9 +28,6 @@
 /* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
 #include <AvailabilityMacros.h>
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 /* This is a set of defines to configure the SDL features */
 
 #ifdef __LP64__
diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h
index 9e5d4313..92c6a595 100644
--- a/include/SDL_config_minimal.h
+++ b/include/SDL_config_minimal.h
@@ -33,9 +33,6 @@
 
 #include <stdarg.h>
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
diff --git a/include/SDL_config_nintendods.h b/include/SDL_config_nintendods.h
index a6bc07a6..5f71b98d 100644
--- a/include/SDL_config_nintendods.h
+++ b/include/SDL_config_nintendods.h
@@ -27,9 +27,6 @@
 
 /* This is a set of defines to configure the SDL features */
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index 88440d69..da05654b 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -28,9 +28,6 @@
 /* General platform specific identifiers */
 #include "SDL_platform.h"
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 #define SDL_HAS_64BIT_TYPE 1
 #define SDL_BYTEORDER 1234
 
diff --git a/include/SDL_config_win32.h b/include/SDL_config_win32.h
index 143371aa..9dc1645b 100644
--- a/include/SDL_config_win32.h
+++ b/include/SDL_config_win32.h
@@ -27,9 +27,6 @@
 
 /* This is a set of defines to configure the SDL features */
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
 #if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
 #define HAVE_STDINT_H	1
diff --git a/include/SDL_config_wiz.h b/include/SDL_config_wiz.h
index e0b35d87..1b4b4ab3 100644
--- a/include/SDL_config_wiz.h
+++ b/include/SDL_config_wiz.h
@@ -28,9 +28,6 @@
 /* General platform specific identifiers */
 #include "SDL_platform.h"
 
-/* SDL internal assertion support */
-#define SDL_DEFAULT_ASSERT_LEVEL 1
-
 /* Make sure that this isn't included by Visual C++ */
 #ifdef _MSC_VER
 #error You should copy include/SDL_config.h.default to include/SDL_config.h