Merge pull request #12040 from ccawley2011/arch.h

Remove base/arch.h

UWP/NativeUWP/NativeUWP.vcxproj

@@ -379,7 +379,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ext\native\base\arch.h" />
     <ClInclude Include="..\..\ext\native\base\backtrace.h" />
     <ClInclude Include="..\..\ext\native\base\basictypes.h" />
     <ClInclude Include="..\..\ext\native\base\buffer.h" />

UWP/NativeUWP/NativeUWP.vcxproj.filters

@@ -478,9 +478,6 @@
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="..\..\ext\native\base\arch.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\base\backtrace.h">
       <Filter>base</Filter>
     </ClInclude>

ext/native/base/arch.h

@@ -1,17 +0,0 @@
-#pragma once
-
-// This provides MSVC's arch-detection defines on other platforms as well.
-
-#ifndef _WIN32
-
-#if defined(__x86_64__) && !defined(_M_X64)
-#define _M_X64 1
-#endif
-
-#if defined(__x86__) && !defined(_M_IX86)
-#define _M_IX86 1
-#endif
-
-// TODO: ARM, ARM64
-
-#endif

ext/native/base/logging.h

@@ -2,7 +2,7 @@
 
 #include <cstring>
 
-#include "base/arch.h"
+#include "ppsspp_config.h"
 #include "base/backtrace.h"
 
 // Simple wrapper around Android's logging interface that also allows other

ext/native/math/fast/fast_math.c

@@ -1,4 +1,3 @@
-#include "base/arch.h"
 #include "fast_math.h"
 #include "fast_matrix.h"