From 95ba8d1e130635dfe28a2d181a748fab225dd1df Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 9 Mar 2011 11:07:26 +0100 Subject: [PATCH 1/4] Disabled mStereoSeparation and mMaxMixChannels until library is updated on Windows. --- src/modules/sound/lullaby/ModPlugDecoder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; From 3dd2cc0c57e1a25d567e4f2d310295b55993d525 Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 9 Mar 2011 12:07:13 +0100 Subject: [PATCH 2/4] Removed unused local variable. --- src/modules/thread/sdl/wrap_Thread.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp index 9d58f5155..0f2e300f6 100644 --- a/src/modules/thread/sdl/wrap_Thread.cpp +++ b/src/modules/thread/sdl/wrap_Thread.cpp @@ -287,7 +287,6 @@ namespace sdl luax_convobj(L, 2, "filesystem", "newFile"); if (luax_istype(L, 2, FILESYSTEM_FILE_T)) { - Data * d; try { data = luax_checktype(L, 2, "File", FILESYSTEM_FILE_T)->read(); } catch (love::Exception & e) { From 10a16028403a4c791283420dfbce051e89d3bbc7 Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 9 Mar 2011 11:11:21 +0100 Subject: [PATCH 3/4] Silence int -> float warnings on Windows. --- src/modules/graphics/opengl/Graphics.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 65cf30a0b..269233bad 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -735,7 +735,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 @@ -760,7 +760,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; @@ -772,7 +772,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)); From 3c7353be9df4c9bd1dff39b195bae7acd907b45a Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 9 Mar 2011 12:34:34 +0100 Subject: [PATCH 4/4] Silence warnings in luasocket/GLee. --- platform/msvc2010/love.vcxproj | 56 +++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/platform/msvc2010/love.vcxproj b/platform/msvc2010/love.vcxproj index 8a547e07f..66379eef9 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 @@ -71,7 +97,9 @@ - + + TurnOffAllWarnings +