Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/GameLogic/Joystick/SCA_Joystick.h')
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.h11
1 files changed, 11 insertions, 0 deletions
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
/**