From 441390e5c582157f05b259fdac2cf11555874974 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 21 Jun 2013 00:12:19 +0000 Subject: [PATCH] - fixed vc++ 2012 build - some fixes found from vc++ 2012 code analyser --- mk/windoze/vc2012/g2xml.vcxproj | 1 + mk/windoze/vc2012/g3d_viewer.vcxproj | 2 +- mk/windoze/vc2012/glest_editor.vcxproj | 2 +- mk/windoze/vc2012/glest_game.vcxproj | 2 +- mk/windoze/vc2012/libstreflop.vcxproj | 2 +- mk/windoze/vc2012/megaglest_tests.vcxproj | 3 ++- mk/windoze/vc2012/shared_lib.vcxproj | 2 +- mk/windoze/vc2012/xml2g.vcxproj | 1 + source/shared_lib/sources/graphics/model.cpp | 6 +++--- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mk/windoze/vc2012/g2xml.vcxproj b/mk/windoze/vc2012/g2xml.vcxproj index 0e79c8bf..f03bee34 100644 --- a/mk/windoze/vc2012/g2xml.vcxproj +++ b/mk/windoze/vc2012/g2xml.vcxproj @@ -81,6 +81,7 @@ Level3 ProgramDatabase true + StreamingSIMDExtensions2 true diff --git a/mk/windoze/vc2012/g3d_viewer.vcxproj b/mk/windoze/vc2012/g3d_viewer.vcxproj index 55121f12..02bcd3cd 100644 --- a/mk/windoze/vc2012/g3d_viewer.vcxproj +++ b/mk/windoze/vc2012/g3d_viewer.vcxproj @@ -94,7 +94,7 @@ true Async MultiThreaded - StreamingSIMDExtensions + StreamingSIMDExtensions2 diff --git a/mk/windoze/vc2012/glest_editor.vcxproj b/mk/windoze/vc2012/glest_editor.vcxproj index ecc59e3e..28fb3bf5 100644 --- a/mk/windoze/vc2012/glest_editor.vcxproj +++ b/mk/windoze/vc2012/glest_editor.vcxproj @@ -94,7 +94,7 @@ true Async MultiThreaded - StreamingSIMDExtensions + StreamingSIMDExtensions2 diff --git a/mk/windoze/vc2012/glest_game.vcxproj b/mk/windoze/vc2012/glest_game.vcxproj index 764b544e..35bb057b 100644 --- a/mk/windoze/vc2012/glest_game.vcxproj +++ b/mk/windoze/vc2012/glest_game.vcxproj @@ -124,7 +124,7 @@ Async MultiThreaded true - StreamingSIMDExtensions + StreamingSIMDExtensions2 Precise $(OutDir)$(TargetName).pdb Level3 diff --git a/mk/windoze/vc2012/libstreflop.vcxproj b/mk/windoze/vc2012/libstreflop.vcxproj index 0ef8bf70..8331b6e9 100644 --- a/mk/windoze/vc2012/libstreflop.vcxproj +++ b/mk/windoze/vc2012/libstreflop.vcxproj @@ -103,7 +103,7 @@ Async MultiThreaded true - StreamingSIMDExtensions + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windoze/vc2012/megaglest_tests.vcxproj b/mk/windoze/vc2012/megaglest_tests.vcxproj index f2baff4e..e3de566f 100644 --- a/mk/windoze/vc2012/megaglest_tests.vcxproj +++ b/mk/windoze/vc2012/megaglest_tests.vcxproj @@ -82,6 +82,7 @@ ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/sound/ds8;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/windows_deps_2012/libircclient/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/windows_deps_2012/google-breakpad\trunk\src\client\windows\;../../../source/windows_deps_2012/google-breakpad\trunk\src\;../../../source/windows_deps_2012/cppunit/include MultiThreaded Fast + StreamingSIMDExtensions2 Console @@ -101,7 +102,7 @@ - + diff --git a/mk/windoze/vc2012/shared_lib.vcxproj b/mk/windoze/vc2012/shared_lib.vcxproj index ad72f4c4..b26bad04 100644 --- a/mk/windoze/vc2012/shared_lib.vcxproj +++ b/mk/windoze/vc2012/shared_lib.vcxproj @@ -105,7 +105,7 @@ Async MultiThreaded true - StreamingSIMDExtensions + StreamingSIMDExtensions2 Precise true $(OutDir)$(ProjectName).pdb diff --git a/mk/windoze/vc2012/xml2g.vcxproj b/mk/windoze/vc2012/xml2g.vcxproj index d066f8f6..5b20f3d5 100644 --- a/mk/windoze/vc2012/xml2g.vcxproj +++ b/mk/windoze/vc2012/xml2g.vcxproj @@ -85,6 +85,7 @@ Level3 ProgramDatabase true + StreamingSIMDExtensions2 wsock32.lib;libxml2_a.lib;%(AdditionalDependencies) diff --git a/source/shared_lib/sources/graphics/model.cpp b/source/shared_lib/sources/graphics/model.cpp index 92ceff3a..3db006ef 100644 --- a/source/shared_lib/sources/graphics/model.cpp +++ b/source/shared_lib/sources/graphics/model.cpp @@ -1608,7 +1608,7 @@ void Model::autoJoinMeshFrames() { if(iterMap->second.size() > 1) { // Time to join mesh data for this mesh - for(int joinIndex = 1; + for(unsigned int joinIndex = 1; joinIndex < iterMap->second.size(); ++joinIndex) { Mesh *mesh = iterMap->second[joinIndex]; if(base->getIndexCount() + mesh->getIndexCount() > 0xffff) { @@ -1630,7 +1630,7 @@ void Model::autoJoinMeshFrames() { uint32 join_index = 0; // Join mesh vertices and normals - for(int frameIndex = 0; + for(unsigned int frameIndex = 0; frameIndex < base->getFrameCount(); ++frameIndex) { uint32 baseIndex = frameIndex * originalBaseVertexCount; uint32 meshIndex = frameIndex * mesh->getVertexCount(); @@ -1684,7 +1684,7 @@ void Model::autoJoinMeshFrames() { base->getIndexCount() * sizeof(uint32)); join_index_index += base->getIndexCount(); - for(int meshIndex = 0; + for(unsigned int meshIndex = 0; meshIndex < mesh->getIndexCount(); ++meshIndex) { uint32 index_value = mesh->getIndices()[meshIndex];