summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-28 19:32:40 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-28 20:26:00 +0300
commitdda65b8fb01ac399af8fa44085db3cd9ab6cef2b (patch)
treeb1ce9789df7284f3701c191f36ae50d1b60ea262
parentbab032c4999ab5a1c4da48c14c9a959c686f5da8 (diff)
downloadmv-dda65b8fb01ac399af8fa44085db3cd9ab6cef2b.tar.gz
mv-dda65b8fb01ac399af8fa44085db3cd9ab6cef2b.tar.bz2
mv-dda65b8fb01ac399af8fa44085db3cd9ab6cef2b.tar.xz
mv-dda65b8fb01ac399af8fa44085db3cd9ab6cef2b.zip
Add workaround for fix compilation warnings in SDL2.
-rw-r--r--src/input/keyboardconfig.h8
-rw-r--r--src/localconsts.h37
-rw-r--r--src/logger.h8
-rw-r--r--src/net/sdltcpnet.h8
-rw-r--r--src/resources/screenshothelper.h8
-rw-r--r--src/soundmanager.h8
-rw-r--r--src/utils/physfsrwops.h8
-rw-r--r--src/utils/sdl2helper.h4
-rwxr-xr-xtools/ci/jobs/gccsnapshot_sdl2.sh2
9 files changed, 75 insertions, 16 deletions
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index a67101514..21b7ac608 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -23,6 +23,14 @@
#ifndef INPUT_KEYBOARDCONFIG_H
#define INPUT_KEYBOARDCONFIG_H
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_keyboard.h>
#include "sdlshared.h"
diff --git a/src/localconsts.h b/src/localconsts.h
index 96943671e..4f5358763 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -18,21 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <SDL_version.h>
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-#ifndef USE_SDL2
-#warning using SDL2 headers but configure set to use SDL1.2
-#warning please add configure flag --with-sdl2
-#define USE_SDL2
-#endif
-#else
-#ifdef USE_SDL2
-#error using SDL1.2 headers but configure set to use SDL2
-#error please remove configure flag --with-sdl2
-#endif
-#endif
-
#define CAST_8 static_cast<char>
#define CAST_S8 static_cast<int8_t>
#define CAST_U8 static_cast<uint8_t>
@@ -237,6 +222,28 @@
#endif // ENABLE_CHECKS
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_version.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+#ifndef USE_SDL2
+#warning using SDL2 headers but configure set to use SDL1.2
+#warning please add configure flag --with-sdl2
+#define USE_SDL2
+#endif
+#else
+#ifdef USE_SDL2
+#error using SDL1.2 headers but configure set to use SDL2
+#error please remove configure flag --with-sdl2
+#endif
+#endif
+
// #define DEBUG_CONFIG 1
// #define DEBUG_BIND_TEXTURE 1
// #define DISABLE_RESOURCE_CACHING 1
diff --git a/src/logger.h b/src/logger.h
index cdac1ffc5..abf2a72c1 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -25,6 +25,14 @@
#include "main.h"
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_mutex.h>
#include <fstream>
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index be5879fb3..7d0a491c8 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -21,6 +21,14 @@
#ifndef NET_SDLTCPNET_H
#define NET_SDLTCPNET_H
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_net.h>
#include "localconsts.h"
diff --git a/src/resources/screenshothelper.h b/src/resources/screenshothelper.h
index d74abfd73..6982c681a 100644
--- a/src/resources/screenshothelper.h
+++ b/src/resources/screenshothelper.h
@@ -23,6 +23,14 @@
#ifndef RESOURCES_SCREENSHOTHELPER_H
#define RESOURCES_SCREENSHOTHELPER_H
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_video.h>
#include "localconsts.h"
diff --git a/src/soundmanager.h b/src/soundmanager.h
index a73975536..8de7b0dfa 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -23,6 +23,14 @@
#ifndef SOUNDMANAGER_H
#define SOUNDMANAGER_H
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_mixer.h>
#include "listeners/configlistener.h"
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index 4c3c05988..e1226f3b4 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -25,6 +25,14 @@
#ifndef UTILS_PHYSFSRWOPS_H
#define UTILS_PHYSFSRWOPS_H
+#ifdef USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#endif
+#include <SDL_stdinc.h>
+#ifdef USE_SDL2
+#pragma GCC diagnostic pop
+#endif
#include <SDL_rwops.h>
#include "utils/physfstools.h"
diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h
index d1b918b51..7cf471542 100644
--- a/src/utils/sdl2helper.h
+++ b/src/utils/sdl2helper.h
@@ -24,6 +24,10 @@
#ifdef USE_SDL2
#include "utils/stringvector.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#include <SDL_stdinc.h>
+#pragma GCC diagnostic pop
#include <SDL_thread.h>
#include "localconsts.h"
diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh
index 1750e704a..6c80af066 100755
--- a/tools/ci/jobs/gccsnapshot_sdl2.sh
+++ b/tools/ci/jobs/gccsnapshot_sdl2.sh
@@ -14,7 +14,7 @@ aptget_install gcc-snapshot \
export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
-Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 -Wno-switch-default"
+-std=gnu++1z -Wformat=1"
source ./tools/ci/flags/gccsnapshot.sh