From 0a0008cf9762f8a2b575e95a8d86b818591748d2 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sun, 9 Aug 2015 22:41:18 +0100 Subject: [PATCH] Rename Utilities/Math.h to Utilities/MathUtils.h Math.h conflicts with on Visual Studio and causes the utilities project to fail. Rename it to MathUtils.h instead. --- common/build/Utilities/utilities_vs2013.vcxproj | 2 +- common/build/Utilities/utilities_vs2013.vcxproj.filters | 2 +- common/include/Utilities/{Math.h => MathUtils.h} | 0 pcsx2/MMI.cpp | 2 +- pcsx2/x86/iMMI.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename common/include/Utilities/{Math.h => MathUtils.h} (100%) diff --git a/common/build/Utilities/utilities_vs2013.vcxproj b/common/build/Utilities/utilities_vs2013.vcxproj index fee862f736..16744bdd55 100644 --- a/common/build/Utilities/utilities_vs2013.vcxproj +++ b/common/build/Utilities/utilities_vs2013.vcxproj @@ -166,7 +166,7 @@ - + diff --git a/common/build/Utilities/utilities_vs2013.vcxproj.filters b/common/build/Utilities/utilities_vs2013.vcxproj.filters index 9dc015334a..ae40b772b7 100644 --- a/common/build/Utilities/utilities_vs2013.vcxproj.filters +++ b/common/build/Utilities/utilities_vs2013.vcxproj.filters @@ -168,7 +168,7 @@ Header Files - + Header Files diff --git a/common/include/Utilities/Math.h b/common/include/Utilities/MathUtils.h similarity index 100% rename from common/include/Utilities/Math.h rename to common/include/Utilities/MathUtils.h diff --git a/pcsx2/MMI.cpp b/pcsx2/MMI.cpp index 9aa68670e6..df28a2e8ee 100644 --- a/pcsx2/MMI.cpp +++ b/pcsx2/MMI.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "Common.h" -#include "Utilities/Math.h" +#include "Utilities/MathUtils.h" namespace R5900 { namespace Interpreter { diff --git a/pcsx2/x86/iMMI.cpp b/pcsx2/x86/iMMI.cpp index 0183c4e5b1..be5eae38e1 100644 --- a/pcsx2/x86/iMMI.cpp +++ b/pcsx2/x86/iMMI.cpp @@ -25,7 +25,7 @@ #include "R5900OpcodeTables.h" #include "iR5900.h" #include "iMMI.h" -#include "Utilities/Math.h" +#include "Utilities/MathUtils.h" using namespace x86Emitter;