diff --git a/platform/msvc2010/love.vcxproj b/platform/msvc2010/love.vcxproj
index 15566914d..bb4e4b4e0 100644
--- a/platform/msvc2010/love.vcxproj
+++ b/platform/msvc2010/love.vcxproj
@@ -21,19 +21,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
+
+ TurnOffAllWarnings
+
false
@@ -69,7 +95,9 @@
-
+
+ TurnOffAllWarnings
+
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index 0efcb9c1e..16fa606fb 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -738,7 +738,7 @@ namespace opengl
using namespace std;
string text(str);
- const float width_space = currentFont->getWidth(' ');
+ const float width_space = static_cast(currentFont->getWidth(' '));
vector lines_to_draw;
//split text at newlines
@@ -763,7 +763,7 @@ namespace opengl
if (width >= wrap) {
lines_to_draw.push_back( string_builder.str() );
string_builder.str( "" );
- width = currentFont->getWidth( word );
+ width = static_cast(currentFont->getWidth( word ));
}
string_builder << word << " ";
width += width_space;
@@ -775,7 +775,7 @@ namespace opengl
// now for the actual printing
vector::const_iterator line_iter, line_end = lines_to_draw.end();
for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) {
- float width = currentFont->getWidth( *line_iter );
+ float width = static_cast(currentFont->getWidth( *line_iter ));
switch (align) {
case ALIGN_RIGHT:
currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y));
diff --git a/src/modules/sound/lullaby/ModPlugDecoder.cpp b/src/modules/sound/lullaby/ModPlugDecoder.cpp
index 05bfd8f5a..4dff48aa7 100644
--- a/src/modules/sound/lullaby/ModPlugDecoder.cpp
+++ b/src/modules/sound/lullaby/ModPlugDecoder.cpp
@@ -17,7 +17,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
-
+#include
#include "ModPlugDecoder.h"
#include
@@ -41,8 +41,11 @@ namespace lullaby
// fill with modplug defaults (modplug _memsets_, so we could get
// garbage settings when the struct is only partially initialized)
+#ifndef LOVE_WINDOWS
+ // This does not exist yet on Windows.
settings.mStereoSeparation = 128;
settings.mMaxMixChannels = 32;
+#endif // LOVE_WINDOWS
settings.mReverbDepth = 0;
settings.mReverbDelay = 0;
settings.mBassAmount = 0;