ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Utilities/Math.h to Utilities/MathUtils.h 

Math.h conflicts with <math.h> on Visual Studio and causes the utilities
project to fail. Rename it to MathUtils.h instead.
This commit is contained in:
Jonathan Li 2015-08-09 22:41:18 +01:00
parent 76d84bf6a5
commit 0a0008cf97
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build/Utilities/utilities_vs2013.vcxproj
View File

@ -166,7 +166,7 @@
<ClInclude Include="..\..\include\Utilities\HashMap.h" /> <ClInclude Include="..\..\include\Utilities\HashMap.h" />
<ClInclude Include="..\..\include\intrin_x86.h" /> <ClInclude Include="..\..\include\intrin_x86.h" />
<ClInclude Include="..\..\include\Utilities\lnx_memzero.h" /> <ClInclude Include="..\..\include\Utilities\lnx_memzero.h" />
<ClInclude Include="..\..\include\Utilities\Math.h" /> <ClInclude Include="..\..\include\Utilities\MathUtils.h" />
<ClInclude Include="..\..\include\Utilities\MemcpyFast.h" /> <ClInclude Include="..\..\include\Utilities\MemcpyFast.h" />
<ClInclude Include="..\..\include\Utilities\Path.h" /> <ClInclude Include="..\..\include\Utilities\Path.h" />
<ClInclude Include="..\..\src\Utilities\PrecompiledHeader.h" /> <ClInclude Include="..\..\src\Utilities\PrecompiledHeader.h" />

2
common/build/Utilities/utilities_vs2013.vcxproj.filters
View File

@ -168,7 +168,7 @@
<ClInclude Include="..\..\include\Utilities\lnx_memzero.h"> <ClInclude Include="..\..\include\Utilities\lnx_memzero.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\Utilities\Math.h"> <ClInclude Include="..\..\include\Utilities\MathUtils.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\Utilities\MemcpyFast.h"> <ClInclude Include="..\..\include\Utilities\MemcpyFast.h">

0
common/include/Utilities/Math.h → common/include/Utilities/MathUtils.h
View File

2
pcsx2/MMI.cpp
View File

@ -16,7 +16,7 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "Common.h" #include "Common.h"
#include "Utilities/Math.h" #include "Utilities/MathUtils.h"
namespace R5900 { namespace R5900 {
namespace Interpreter { namespace Interpreter {

2
pcsx2/x86/iMMI.cpp
View File

@ -25,7 +25,7 @@
#include "R5900OpcodeTables.h" #include "R5900OpcodeTables.h"
#include "iR5900.h" #include "iR5900.h"
#include "iMMI.h" #include "iMMI.h"
#include "Utilities/Math.h" #include "Utilities/MathUtils.h"
using namespace x86Emitter; using namespace x86Emitter;