diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:44:54 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:44:54 +0300 |
commit | d3fa1bd4d5a8ec82ffa41b996d7169711ee5831d (patch) | |
tree | 4472deab335b24fa50495daeca8f38be0bd05c9a /source/gameengine/GameLogic | |
parent | 073ce98231d5576c8bff2aab012ba341e058c316 (diff) |
Fix warnings reported by MSVC
Mainly it's related on a bad practice in SDL to force-define __SSE__
and __SSE2__ flags which generates quite some warnings and causes too
much noise.
There are some other warnings fixed. Should be no functional changes.
NeXyon, please check the changes in audaspace :)
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.h | 11 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index b03570e3c28..1a66b2aee52 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -29,10 +29,6 @@ * \ingroup gamelogic */ -#ifdef WITH_SDL -# include <SDL.h> -#endif - #include <stdio.h> #include <stdlib.h> diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h index dd9fbefa545..c9221753d45 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h @@ -34,7 +34,18 @@ #include "SCA_JoystickDefines.h" #ifdef WITH_SDL +/* SDL force defines __SSE__ and __SSE2__ flags, which generates warnings + * because we pass those defines via command line as well. For until there's + * proper ifndef added to SDL headers we ignore the redefinition warning. + */ +# ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4005) +# endif # include "SDL.h" +# ifdef _MSC_VER +# pragma warning(pop) +# endif #endif /** diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp index 0033c137eb6..fd3d713b3d2 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp @@ -29,10 +29,6 @@ * \ingroup gamelogic */ -#ifdef WITH_SDL -# include <SDL.h> -#endif - #include "SCA_Joystick.h" #include "SCA_JoystickPrivate.h" |