diff --git a/.github/workflows/manual_generate_uwp.yml b/.github/workflows/manual_generate_uwp.yml index 10ea95311b..8995d81ce1 100644 --- a/.github/workflows/manual_generate_uwp.yml +++ b/.github/workflows/manual_generate_uwp.yml @@ -21,7 +21,6 @@ on: - Bundle - x64 - ARM64 - - ARM signedPackage: type: boolean @@ -101,7 +100,7 @@ jobs: if: github.event.inputs.buildPlatform == 'Bundle' run: | echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}" - msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=x64 /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=${{ github.event.inputs.signedPackage }} /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="x64|ARM64|ARM" + msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=x64 /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=${{ github.event.inputs.signedPackage }} /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="x64|ARM64" - name: Package build working-directory: ${{ github.workspace }} diff --git a/Common/GPU/ShaderTranslation.cpp b/Common/GPU/ShaderTranslation.cpp index c9a2b0029b..fd36a6419b 100644 --- a/Common/GPU/ShaderTranslation.cpp +++ b/Common/GPU/ShaderTranslation.cpp @@ -29,11 +29,6 @@ #undef realloc #endif -// Weird issue -#if PPSSPP_PLATFORM(WINDOWS) && PPSSPP_ARCH(ARM) -#undef free -#endif - #include "Common/Log.h" #include "Common/StringUtils.h" #include "Common/GPU/Shader.h" diff --git a/Common/MachineContext.h b/Common/MachineContext.h index f8c2a4b1cc..f581471d0e 100644 --- a/Common/MachineContext.h +++ b/Common/MachineContext.h @@ -61,12 +61,6 @@ typedef CONTEXT SContext; #define CTX_SP Sp #define CTX_PC Pc -#elif PPSSPP_ARCH(ARM) - -//#define CTX_REG(x) R##x -#define CTX_SP Sp -#define CTX_PC Pc - #endif #elif PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS) diff --git a/Core/MIPS/ARM/ArmCompVFPU.cpp b/Core/MIPS/ARM/ArmCompVFPU.cpp index c4b51f7b13..4afda56d61 100644 --- a/Core/MIPS/ARM/ArmCompVFPU.cpp +++ b/Core/MIPS/ARM/ArmCompVFPU.cpp @@ -2215,7 +2215,6 @@ namespace MIPSComp // Very heavily used by FF:CC. Should be replaced by a fast approximation instead of // calling the math library. - // Apparently this may not work on hardfp. I don't think we have any platforms using this though. void ArmJit::Comp_VRot(MIPSOpcode op) { // VRot probably doesn't accept prefixes anyway. CONDITIONAL_DISABLE(VFPU_VEC); @@ -2223,10 +2222,6 @@ namespace MIPSComp DISABLE; } -#if PPSSPP_ARCH(ARM_HARDFP) - DISABLE; -#endif - int vd = _VD; int vs = _VS; diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 67b61949a9..2a767cdcf1 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -328,8 +328,6 @@ namespace Reporting return "Windows ARM64"; #elif defined(_WIN64) return "Windows 64"; -#elif defined(_WIN32) && defined(_M_ARM) - return "Windows ARM32"; #elif defined(_WIN32) return "Windows"; #elif PPSSPP_PLATFORM(IOS) diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 000bdbb711..9ca51ade99 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -63,9 +63,7 @@ #include "Common/GPU/GraphicsContext.h" #include "Windows/main.h" -#ifndef _M_ARM #include "Windows/DinputDevice.h" -#endif #include "Windows/resource.h" #include "Windows/MainWindow.h" @@ -1002,9 +1000,7 @@ namespace MainWindow { return WindowsRawInput::ProcessChar(hWnd, wParam, lParam); case WM_DEVICECHANGE: -#ifndef _M_ARM DinputDevice::CheckDevices(); -#endif if (winCamera) winCamera->CheckDevices(); if (winMic) diff --git a/ppsspp_config.h b/ppsspp_config.h index 7984a3d1b8..f35e1493b8 100644 --- a/ppsspp_config.h +++ b/ppsspp_config.h @@ -32,7 +32,7 @@ #endif #endif -#if defined(__arm__) || defined(_M_ARM) +#if defined(__arm__) #define PPSSPP_ARCH_ARM 1 #define PPSSPP_ARCH_32BIT 1 @@ -49,11 +49,6 @@ #if defined(__ARM_NEON) || defined(__ARM_NEON__) #define PPSSPP_ARCH_ARM_NEON 1 #endif - - #if defined(_M_ARM) - #define PPSSPP_ARCH_ARMV7 1 - #define PPSSPP_ARCH_ARM_NEON 1 - #endif #endif #if defined(__aarch64__) || defined(_M_ARM64) @@ -94,9 +89,6 @@ #if defined(_WIN32) // Covers both 32 and 64bit Windows #define PPSSPP_PLATFORM_WINDOWS 1 - #ifdef _M_ARM - #define PPSSPP_ARCH_ARM_HARDFP 1 - #endif // UWP trickery #if defined(WINAPI_FAMILY) && defined(WINAPI_FAMILY_PARTITION) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP