mirror of https://github.com/PCSX2/pcsx2.git
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:
parent
76d84bf6a5
commit
0a0008cf97
|
@ -166,7 +166,7 @@
|
|||
<ClInclude Include="..\..\include\Utilities\HashMap.h" />
|
||||
<ClInclude Include="..\..\include\intrin_x86.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\Path.h" />
|
||||
<ClInclude Include="..\..\src\Utilities\PrecompiledHeader.h" />
|
||||
|
|
|
@ -168,7 +168,7 @@
|
|||
<ClInclude Include="..\..\include\Utilities\lnx_memzero.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\Utilities\Math.h">
|
||||
<ClInclude Include="..\..\include\Utilities\MathUtils.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\Utilities\MemcpyFast.h">
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "PrecompiledHeader.h"
|
||||
#include "Common.h"
|
||||
#include "Utilities/Math.h"
|
||||
#include "Utilities/MathUtils.h"
|
||||
|
||||
namespace R5900 {
|
||||
namespace Interpreter {
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "R5900OpcodeTables.h"
|
||||
#include "iR5900.h"
|
||||
#include "iMMI.h"
|
||||
#include "Utilities/Math.h"
|
||||
#include "Utilities/MathUtils.h"
|
||||
|
||||
using namespace x86Emitter;
|
||||
|
||||
|
|
Loading…
Reference in New Issue