diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index d163a73729..272de6119f 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -93,7 +93,7 @@ set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") #------------------------------------------------------------------------------- # Set some default compiler flags #------------------------------------------------------------------------------- -set(DEFAULT_WARNINGS "-Wno-write-strings -Wno-format -Wno-unused-parameter -Wno-unused-value -Wstrict-aliasing -Wno-unused-function -Wno-attributes -Wno-unused-result -Wno-missing-field-initializers -Wno-unused-local-typedefs") +set(DEFAULT_WARNINGS "-Wno-write-strings -Wno-format -Wno-unused-parameter -Wno-unused-value -Wstrict-aliasing -Wno-unused-function -Wno-attributes -Wno-unused-result -Wno-missing-field-initializers -Wno-unused-local-typedefs -Wno-parentheses") set(DEFAULT_GCC_FLAG "-m32 -msse -msse2 -march=i686 -pthread ${DEFAULT_WARNINGS}") set(DEFAULT_CPP_FLAG "${DEFAULT_GCC_FLAG} -Wno-invalid-offsetof") diff --git a/pcsx2/IPU/mpeg2lib/Idct.cpp b/pcsx2/IPU/mpeg2lib/Idct.cpp index 82492b2545..9848f63781 100644 --- a/pcsx2/IPU/mpeg2lib/Idct.cpp +++ b/pcsx2/IPU/mpeg2lib/Idct.cpp @@ -213,7 +213,7 @@ __ri void mpeg2_idct_add (const int last, s16 * block, s16 * dest, const int str } else { - int DC = (block[0] + 4) >> 3; + s16 DC = (block[0] + 4) >> 3; s16 dcf[2] = { DC, DC }; block[0] = block[63] = 0; diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index a1f3760c59..d8e88d0974 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -1008,8 +1008,8 @@ void SysCorePlugins::Load( const wxString (&folders)[PluginId_Count] ) { 0, PCSX2_VersionHi, PCSX2_VersionLo, SVN_REV }, - x86caps.PhysicalCores, - x86caps.LogicalCores, + (int)x86caps.PhysicalCores, + (int)x86caps.LogicalCores, sizeof(wchar_t), 0,0,0,0,0,0, diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp index 0b3f5c834a..213df7e063 100644 --- a/pcsx2/R5900OpcodeImpl.cpp +++ b/pcsx2/R5900OpcodeImpl.cpp @@ -570,8 +570,8 @@ void LWU() cpuRegs.GPR.r[_Rt_].UD[0] = temp; } -static const s32 LWL_MASK[4] = { 0xffffff, 0x0000ffff, 0x000000ff, 0x00000000 }; -static const s32 LWR_MASK[4] = { 0x000000, 0xff000000, 0xffff0000, 0xffffff00 }; +static const u32 LWL_MASK[4] = { 0xffffff, 0x0000ffff, 0x000000ff, 0x00000000 }; +static const u32 LWR_MASK[4] = { 0x000000, 0xff000000, 0xffff0000, 0xffffff00 }; static const u8 LWL_SHIFT[4] = { 24, 16, 8, 0 }; static const u8 LWR_SHIFT[4] = { 0, 8, 16, 24 }; diff --git a/pcsx2/x86/iFPUd.cpp b/pcsx2/x86/iFPUd.cpp index 75306a0e55..bd89b39525 100644 --- a/pcsx2/x86/iFPUd.cpp +++ b/pcsx2/x86/iFPUd.cpp @@ -110,7 +110,7 @@ namespace DOUBLE { // PS2 -> DOUBLE //------------------------------------------------------------------ -#define SINGLE(sign, exp, mant) (((sign)<<31) | ((exp)<<23) | (mant)) +#define SINGLE(sign, exp, mant) (((u32)(sign)<<31) | ((u32)(exp)<<23) | (u32)(mant)) #define DOUBLE(sign, exp, mant) (((sign ## ULL)<<63) | ((exp ## ULL)<<52) | (mant ## ULL)) struct FPUd_Globals diff --git a/pcsx2/x86/sVU_Upper.cpp b/pcsx2/x86/sVU_Upper.cpp index 3d26a4407d..45875cea69 100644 --- a/pcsx2/x86/sVU_Upper.cpp +++ b/pcsx2/x86/sVU_Upper.cpp @@ -72,7 +72,7 @@ //------------------------------------------------------------------ // Global Variables //------------------------------------------------------------------ -static const __aligned16 int SSEmovMask[ 16 ][ 4 ] = +static const __aligned16 uint SSEmovMask[ 16 ][ 4 ] = { { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, { 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF },