diff --git a/Externals/wxWidgets/build/msw/wx_base.vcproj b/Externals/wxWidgets/build/msw/wx_base.vcproj index 44fcc4885c..cd86ff8b6e 100644 --- a/Externals/wxWidgets/build/msw/wx_base.vcproj +++ b/Externals/wxWidgets/build/msw/wx_base.vcproj @@ -49,6 +49,7 @@ AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib" PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" + ExceptionHandling="2" RuntimeLibrary="0" EnableFunctionLevelLinking="false" RuntimeTypeInfo="true" @@ -127,6 +128,7 @@ AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib" PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" + ExceptionHandling="2" RuntimeLibrary="0" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" @@ -139,7 +141,7 @@ WarningLevel="3" WarnAsError="false" SuppressStartupBanner="true" - DisableSpecificWarnings="4267;4535;" + DisableSpecificWarnings="4267" /> + + @@ -5796,10 +5802,6 @@ /> - - + + + + + + + + + + + + + + + m_Offset], pFileInfo->m_FileSize); + memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], (size_t)pFileInfo->m_FileSize); return((size_t) pFileInfo->m_FileSize); } @@ -156,7 +156,7 @@ CARCFile::ParseBuffer() if (Root.IsDirectory()) { - m_FileInfoVector.resize(Root.m_FileSize); + m_FileInfoVector.resize((unsigned int)Root.m_FileSize); const char* szNameTable = (char*)(m_pBuffer + FSTOffset); for (size_t i = 0; i < m_FileInfoVector.size(); i++) diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index f9478fe5dd..e251d6f93a 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -187,7 +187,7 @@ bool CFileSystemGCWii::InitFileSystem() PanicAlert("Wtf?"); u64 NameTableOffset = FSTOffset; - m_FileInfoVector.reserve(Root.m_FileSize); + m_FileInfoVector.reserve((unsigned int)Root.m_FileSize); for (u32 i = 0; i < Root.m_FileSize; i++) { SFileInfo sfi; diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp index 1259cbe14d..cd6ac8e3cf 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp @@ -327,9 +327,9 @@ void Logging() iupdonce = true; } - for (int i = 0; i < viupd.size(); i++) // 0, 1,..., 9 + for (int i = 0; i < (int)viupd.size(); i++) // 0, 1,..., 9 { - if (i < viupd.size()-1) + if (i < (int)viupd.size()-1) { viupd.at(viupd.size()-i-1) = viupd.at(viupd.size()-i-2); // move all forward } @@ -349,7 +349,7 @@ void Logging() } } - for (int i = 0; i < viupd.size(); i++) + for (int i = 0; i < (int)viupd.size(); i++) { if(viupd.at(i) == 0) sbuff = sbuff + " "; diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj index 25f48fd05c..1b8168b9eb 100644 --- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj +++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj @@ -212,13 +212,13 @@ = 0) diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp index 838088c93b..cc18660ae6 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp @@ -180,7 +180,7 @@ void FillReportAcc(wm_accel& _acc) || shake > 0 ); #endif - if(yhistsize > yhist.size()) yhistsize = (int)yhist.size(); + if(yhistsize > (int)yhist.size()) yhistsize = (int)yhist.size(); for (int i = 1; i < yhistsize; i++) { yhist[i-1] = yhist[i];