Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare

lib/irrlicht/source/Irrlicht/Irrlicht.cpp

@@ -127,7 +127,7 @@ namespace video
 } // end namespace irr
 
 
-#if defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_WINDOWS_API_) && !defined(_IRR_STATIC_LIB_)
 
 BOOL APIENTRY DllMain( HANDLE hModule,
                        DWORD  ul_reason_for_call,

src/graphics/material.cpp

@@ -28,6 +28,7 @@
 #include "config/stk_config.hpp"
 #include "guiengine/engine.hpp"
 #include "graphics/callbacks.hpp"
+#include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/particle_kind_manager.hpp"
 #include "graphics/shaders.hpp"
@@ -37,7 +38,7 @@
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "utils/log.hpp"
-#include "graphics/glwrap.hpp"
+#include "utils/vs.hpp"
 
 #include <IMaterialRendererServices.h>
 #include <ISceneNode.h>

src/guiengine/widgets/icon_button_widget.cpp

@@ -296,7 +296,8 @@ video::ITexture* IconButtonWidget::getDeactivatedTexture(video::ITexture* textur
 
     std::string name = texture->getName().getPath().c_str();
     name += "_disabled";
-    t = irr_driver->getTexture(name);
+    t = irr_driver->getTexture(name, /*premul*/false, /*prediv*/false, 
+                                     /*compain_if_not_found*/false);
     if (t == NULL)
     {
         SColor c;

src/utils/crash_reporting.cpp

@@ -20,7 +20,7 @@
 #include "log.hpp"
 #include <string.h>
 
-#if defined(WIN32) && !defined(DEBUG)
+#if defined(WIN32) && !defined(DEBUG) && !defined(__MINGW32__)
     // --------------------- Windows version -----------------
     #include <Windows.h>
     #include <DbgHelp.h>