diff options
| author | Mai <mai.iam2048@gmail.com> | 2023-12-17 14:43:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 14:43:55 -0500 |
| commit | f0f0f975545f2be95321b258b2065403b210c71a (patch) | |
| tree | 6455d9b05152f0e12375634f1b8cf9cda475843a /Source | |
| parent | 0125b5182f15ba9af56abaf2a7e93cad8e9ecc5e (diff) | |
| parent | ca443d7f898b7d34628d7e4dd83dd61a3b6c66a9 (diff) | |
Merge pull request #12433 from mitaclaw/windows-arm-debug-fix
Fix Windows ARM64 debug build errors
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 2 | ||||
| -rw-r--r-- | Source/dolphin-emu.sln | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index 2190728264..311f5d40d8 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -413,7 +413,7 @@ void JitArm64::WriteExit(u32 destination, bool LK, u32 exit_address_after_return LK &= m_enable_blr_optimization; - const u8* host_address_after_return; + const u8* host_address_after_return = nullptr; if (LK) { // Push {ARM_PC (64-bit); PPC_PC (32-bit); feature_flags (32-bit)} on the stack diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index ebb269de71..a123e396dd 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -175,8 +175,8 @@ Global {AB993F38-C31D-4897-B139-A620C42BC565}.Release|ARM64.Build.0 = Release|ARM64 {AB993F38-C31D-4897-B139-A620C42BC565}.Release|x64.ActiveCfg = Release|x64 {AB993F38-C31D-4897-B139-A620C42BC565}.Release|x64.Build.0 = Release|x64 - {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|ARM64.ActiveCfg = Debug|x64 - {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|ARM64.Build.0 = Debug|x64 + {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|ARM64.Build.0 = Debug|ARM64 {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|x64.ActiveCfg = Debug|x64 {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Debug|x64.Build.0 = Debug|x64 {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}.Release|ARM64.ActiveCfg = Release|ARM64 |