From be8fa87a63cb9bd12941c365a1c8686753da82fe Mon Sep 17 00:00:00 2001
From: "prompt.ac/@jeffrey" <mail@aesthetic.computer>
Date: Sat, 18 Jul 2026 18:08:45 -0700
Subject: [PATCH] Build Xbox native BIOS with C++17

---
 xbox/native-bios/NativeBios.vcxproj | 3 ++-
 xbox/runtime/include/ac/runtime.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xbox/native-bios/NativeBios.vcxproj b/xbox/native-bios/NativeBios.vcxproj
index bcc62f5d93..ce1fa951ce 100644
--- a/xbox/native-bios/NativeBios.vcxproj
+++ b/xbox/native-bios/NativeBios.vcxproj
@@ -34,7 +34,8 @@
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader><PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAsWinRT>true</CompileAsWinRT><WarningLevel>Level4</WarningLevel><SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp20</LanguageStandard>
+      <!-- C++/CX (/ZW) is incompatible with /std:c++20 in MSVC. -->
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalIncludeDirectories>third_party\quickjs-ng;..\runtime\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_APP;QUICKJS_NG_BUILD;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
diff --git a/xbox/runtime/include/ac/runtime.hpp b/xbox/runtime/include/ac/runtime.hpp
index 596bb7c136..d7b7900ab4 100644
--- a/xbox/runtime/include/ac/runtime.hpp
+++ b/xbox/runtime/include/ac/runtime.hpp
@@ -29,7 +29,7 @@ struct GamepadState {
   float left_trigger = 0, right_trigger = 0;
   std::unordered_set<std::string> down;
   [[nodiscard]] bool pressed(std::string_view button) const {
-    return down.contains(std::string(button));
+    return down.find(std::string(button)) != down.end();
   }
 };
 
-- 
2.54.0