mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Remove leftovers of 32-bit ARM Windows support
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
1 parent
aad83c044f
commit
c70fc68261
7 files changed
+2
-33
No files matched your search
@@ -21,7 +21,6 @@ on:
|
|||||||
- Bundle
|
- Bundle
|
||||||
- x64
|
- x64
|
||||||
- ARM64
|
- ARM64
|
||||||
- ARM
|
|
||||||
|
|
||||||
signedPackage:
|
signedPackage:
|
||||||
type: boolean
|
type: boolean
|
||||||
@@ -101,7 +100,7 @@ jobs:
|
|||||||
if: github.event.inputs.buildPlatform == 'Bundle'
|
if: github.event.inputs.buildPlatform == 'Bundle'
|
||||||
run: |
|
run: |
|
||||||
echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}"
|
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
|
- name: Package build
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
|
|||||||
@@ -29,11 +29,6 @@
|
|||||||
#undef realloc
|
#undef realloc
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Weird issue
|
|
||||||
#if PPSSPP_PLATFORM(WINDOWS) && PPSSPP_ARCH(ARM)
|
|
||||||
#undef free
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "Common/Log.h"
|
#include "Common/Log.h"
|
||||||
#include "Common/StringUtils.h"
|
#include "Common/StringUtils.h"
|
||||||
#include "Common/GPU/Shader.h"
|
#include "Common/GPU/Shader.h"
|
||||||
|
|||||||
@@ -61,12 +61,6 @@ typedef CONTEXT SContext;
|
|||||||
#define CTX_SP Sp
|
#define CTX_SP Sp
|
||||||
#define CTX_PC Pc
|
#define CTX_PC Pc
|
||||||
|
|
||||||
#elif PPSSPP_ARCH(ARM)
|
|
||||||
|
|
||||||
//#define CTX_REG(x) R##x
|
|
||||||
#define CTX_SP Sp
|
|
||||||
#define CTX_PC Pc
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
|
#elif PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
|
||||||
|
|||||||
@@ -2215,7 +2215,6 @@ namespace MIPSComp
|
|||||||
|
|
||||||
// Very heavily used by FF:CC. Should be replaced by a fast approximation instead of
|
// Very heavily used by FF:CC. Should be replaced by a fast approximation instead of
|
||||||
// calling the math library.
|
// 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) {
|
void ArmJit::Comp_VRot(MIPSOpcode op) {
|
||||||
// VRot probably doesn't accept prefixes anyway.
|
// VRot probably doesn't accept prefixes anyway.
|
||||||
CONDITIONAL_DISABLE(VFPU_VEC);
|
CONDITIONAL_DISABLE(VFPU_VEC);
|
||||||
@@ -2223,10 +2222,6 @@ namespace MIPSComp
|
|||||||
DISABLE;
|
DISABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PPSSPP_ARCH(ARM_HARDFP)
|
|
||||||
DISABLE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int vd = _VD;
|
int vd = _VD;
|
||||||
int vs = _VS;
|
int vs = _VS;
|
||||||
|
|
||||||
|
|||||||
@@ -328,8 +328,6 @@ namespace Reporting
|
|||||||
return "Windows ARM64";
|
return "Windows ARM64";
|
||||||
#elif defined(_WIN64)
|
#elif defined(_WIN64)
|
||||||
return "Windows 64";
|
return "Windows 64";
|
||||||
#elif defined(_WIN32) && defined(_M_ARM)
|
|
||||||
return "Windows ARM32";
|
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
return "Windows";
|
return "Windows";
|
||||||
#elif PPSSPP_PLATFORM(IOS)
|
#elif PPSSPP_PLATFORM(IOS)
|
||||||
|
|||||||
@@ -63,9 +63,7 @@
|
|||||||
#include "Common/GPU/GraphicsContext.h"
|
#include "Common/GPU/GraphicsContext.h"
|
||||||
|
|
||||||
#include "Windows/main.h"
|
#include "Windows/main.h"
|
||||||
#ifndef _M_ARM
|
|
||||||
#include "Windows/DinputDevice.h"
|
#include "Windows/DinputDevice.h"
|
||||||
#endif
|
|
||||||
#include "Windows/resource.h"
|
#include "Windows/resource.h"
|
||||||
|
|
||||||
#include "Windows/MainWindow.h"
|
#include "Windows/MainWindow.h"
|
||||||
@@ -1002,9 +1000,7 @@ namespace MainWindow {
|
|||||||
return WindowsRawInput::ProcessChar(hWnd, wParam, lParam);
|
return WindowsRawInput::ProcessChar(hWnd, wParam, lParam);
|
||||||
|
|
||||||
case WM_DEVICECHANGE:
|
case WM_DEVICECHANGE:
|
||||||
#ifndef _M_ARM
|
|
||||||
DinputDevice::CheckDevices();
|
DinputDevice::CheckDevices();
|
||||||
#endif
|
|
||||||
if (winCamera)
|
if (winCamera)
|
||||||
winCamera->CheckDevices();
|
winCamera->CheckDevices();
|
||||||
if (winMic)
|
if (winMic)
|
||||||
|
|||||||
+1
-9
@@ -32,7 +32,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__arm__) || defined(_M_ARM)
|
#if defined(__arm__)
|
||||||
#define PPSSPP_ARCH_ARM 1
|
#define PPSSPP_ARCH_ARM 1
|
||||||
#define PPSSPP_ARCH_32BIT 1
|
#define PPSSPP_ARCH_32BIT 1
|
||||||
|
|
||||||
@@ -49,11 +49,6 @@
|
|||||||
#if defined(__ARM_NEON) || defined(__ARM_NEON__)
|
#if defined(__ARM_NEON) || defined(__ARM_NEON__)
|
||||||
#define PPSSPP_ARCH_ARM_NEON 1
|
#define PPSSPP_ARCH_ARM_NEON 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_M_ARM)
|
|
||||||
#define PPSSPP_ARCH_ARMV7 1
|
|
||||||
#define PPSSPP_ARCH_ARM_NEON 1
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__aarch64__) || defined(_M_ARM64)
|
#if defined(__aarch64__) || defined(_M_ARM64)
|
||||||
@@ -94,9 +89,6 @@
|
|||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
// Covers both 32 and 64bit Windows
|
// Covers both 32 and 64bit Windows
|
||||||
#define PPSSPP_PLATFORM_WINDOWS 1
|
#define PPSSPP_PLATFORM_WINDOWS 1
|
||||||
#ifdef _M_ARM
|
|
||||||
#define PPSSPP_ARCH_ARM_HARDFP 1
|
|
||||||
#endif
|
|
||||||
// UWP trickery
|
// UWP trickery
|
||||||
#if defined(WINAPI_FAMILY) && defined(WINAPI_FAMILY_PARTITION)
|
#if defined(WINAPI_FAMILY) && defined(WINAPI_FAMILY_PARTITION)
|
||||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
|
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
|
||||||
|
|||||||
Reference in new issue
Block a user