diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index b81f00fa3..6ab820bbe 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -80,7 +80,7 @@ jobs:
       shell: cmd
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        msbuild duckstation.sln -t:Build -p:Platform=x64;Configuration=ReleaseLTCG
+        msbuild duckstation.sln -t:Build -p:Platform=x64;Configuration=ReleaseLTCG-Clang
 
     - name: Create x64 symbols archive
       shell: cmd
@@ -172,7 +172,7 @@ jobs:
       shell: cmd
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64_arm64
-        msbuild duckstation.sln -t:Build -p:Platform=ARM64;Configuration=ReleaseLTCG
+        msbuild duckstation.sln -t:Build -p:Platform=ARM64;Configuration=ReleaseLTCG-Clang
 
     - name: Create arm64 symbols archive
       shell: cmd
diff --git a/dep/msvc/vsprops/BaseApplication.props b/dep/msvc/vsprops/BaseApplication.props
index 9c1880158..6cc71932f 100644
--- a/dep/msvc/vsprops/BaseApplication.props
+++ b/dep/msvc/vsprops/BaseApplication.props
@@ -4,7 +4,10 @@
     <IntDir>$(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)bin\$(Platform)\</OutDir>
     <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
-    <TargetName>$(ProjectName)-$(Platform)-$(Configuration)</TargetName>
+
+    <!-- Use MSVC suffix for MSVC builds, and remove the Clang suffix. -->
+    <TargetName Condition="$(Configuration.EndsWith(Clang))">$(ProjectName)-$(Platform)-$(Configuration.Replace("-Clang", ""))</TargetName>
+    <TargetName Condition="!$(Configuration.EndsWith(Clang))">$(ProjectName)-$(Platform)-$(Configuration)-MSVC</TargetName>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
 
diff --git a/duckstation.sln b/duckstation.sln
index b2f11eab0..6f9570f74 100644
--- a/duckstation.sln
+++ b/duckstation.sln
@@ -770,51 +770,35 @@ Global
 		{49953E1B-2EF7-46A4-B88B-1BF9E099093B}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
 		{49953E1B-2EF7-46A4-B88B-1BF9E099093B}.ReleaseLTCG-Clang|x86.Build.0 = ReleaseLTCG-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|ARM64.Build.0 = Debug|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|x64.ActiveCfg = Debug|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|x64.Build.0 = Debug|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|x86.ActiveCfg = Debug|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug|x86.Build.0 = Debug|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|x86.ActiveCfg = Debug-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Debug-Clang|x86.Build.0 = Debug-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|x64.Build.0 = DebugFast|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|x86.ActiveCfg = DebugFast|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast|x86.Build.0 = DebugFast|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|x86.ActiveCfg = DebugFast-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.DebugFast-Clang|x86.Build.0 = DebugFast-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|ARM64.ActiveCfg = Release|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|ARM64.Build.0 = Release|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|x64.ActiveCfg = Release|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|x64.Build.0 = Release|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|x86.ActiveCfg = Release|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release|x86.Build.0 = Release|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|x64.Build.0 = Release-Clang|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|x86.ActiveCfg = Release-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.Release-Clang|x86.Build.0 = Release-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
-		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
 		{EA2B9C7A-B8CC-42F9-879B-191A98680C10}.ReleaseLTCG-Clang|x86.Build.0 = ReleaseLTCG-Clang|Win32
 		{075CED82-6A20-46DF-94C7-9624AC9DDBEB}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -958,45 +942,31 @@ Global
 		{7F909E29-4808-4BD9-A60C-56C51A3AAEC2}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
 		{7F909E29-4808-4BD9-A60C-56C51A3AAEC2}.ReleaseLTCG-Clang|x86.Build.0 = ReleaseLTCG-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|ARM64.Build.0 = Debug|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x64.ActiveCfg = Debug|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x64.Build.0 = Debug|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x86.ActiveCfg = Debug|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x86.Build.0 = Debug|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|x86.ActiveCfg = Debug-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|x86.Build.0 = Debug-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|x64.Build.0 = DebugFast|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|x86.ActiveCfg = DebugFast|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast|x86.Build.0 = DebugFast|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|x86.ActiveCfg = DebugFast-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.DebugFast-Clang|x86.Build.0 = DebugFast-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|ARM64.Build.0 = Release|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|x64.ActiveCfg = Release|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|x64.Build.0 = Release|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|x86.ActiveCfg = Release|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release|x86.Build.0 = Release|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|x64.Build.0 = Release-Clang|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|x86.ActiveCfg = Release-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Release-Clang|x86.Build.0 = Release-Clang|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
-		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
 		{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
@@ -1010,6 +980,7 @@ Global
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug|x64.ActiveCfg = Debug|x64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug|x86.ActiveCfg = Debug|ARM64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
+		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.Debug-Clang|x86.ActiveCfg = Debug-Clang|Win32
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
@@ -1035,6 +1006,7 @@ Global
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|ARM64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
+		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
 		{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
 		{0A172B2E-DC67-49FC-A4C1-975F93C586C4}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -1434,49 +1406,41 @@ Global
 		{EE55AA65-EA6B-4861-810B-78354B53A807}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
 		{EE55AA65-EA6B-4861-810B-78354B53A807}.ReleaseLTCG-Clang|x86.Build.0 = ReleaseLTCG-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|x64.ActiveCfg = Debug|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|x64.Build.0 = Debug|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|x86.ActiveCfg = Debug|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug|x86.Build.0 = Debug|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|x86.ActiveCfg = Debug-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Debug-Clang|x86.Build.0 = Debug-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|x64.ActiveCfg = DebugFast|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|x64.Build.0 = DebugFast|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|x86.ActiveCfg = DebugFast|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast|x86.Build.0 = DebugFast|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|x86.ActiveCfg = DebugFast-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|x86.Build.0 = DebugFast-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|ARM64.Build.0 = Release|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x64.ActiveCfg = Release|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x64.Build.0 = Release|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x86.ActiveCfg = Release|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x86.Build.0 = Release|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x64.Build.0 = Release-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x86.ActiveCfg = Release-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x86.Build.0 = Release-Clang|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|x86.ActiveCfg = ReleaseLTCG-Clang|Win32
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 6782bd357..f034ec40f 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -190,7 +190,7 @@
     <ProjectReference Include="..\..\dep\zstd\zstd.vcxproj">
       <Project>{73ee0c55-6ffe-44e7-9c12-baa52434a797}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\dep\zydis\zydis.vcxproj">
+    <ProjectReference Include="..\..\dep\zydis\zydis.vcxproj" Condition="'$(Platform)'=='x64'">
       <Project>{c51a346a-86b2-46df-9bb3-d0aa7e5d8699}</Project>
     </ProjectReference>
     <ProjectReference Include="..\scmversion\scmversion.vcxproj">
@@ -207,7 +207,7 @@
   <Import Project="core.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>ZYDIS_DISABLE_ENCODER;ZYDIS_DISABLE_AVX512;ZYDIS_DISABLE_KNC;ZYDIS_STATIC_BUILD;ZYCORE_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">ZYDIS_DISABLE_ENCODER;ZYDIS_DISABLE_AVX512;ZYDIS_DISABLE_KNC;ZYDIS_STATIC_BUILD;ZYCORE_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(SolutionDir)dep\zydis\include;$(SolutionDir)dep\zydis\dependencies\zycore\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <PrecompiledHeader>Use</PrecompiledHeader>