Test Windows build without clang-cl

.github/workflows/Windows.yml

@@ -24,6 +24,6 @@ jobs:
     - name: install-deps
       run: vcpkg install --triplet x64-windows gtest lua
     - name: configure
-      run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -T ClangCL
+      run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
     - name: make
       run: cmake --build build --target hydra --config Release

include/compatibility.hxx

@@ -104,29 +104,6 @@ namespace hydra
         return (x >> 8) | (x << 8);
     }
 
-    __attribute__((target("movbe"))) inline uint32_t bswap32(uint32_t x)
-    {
-#ifdef _load_be_u32
-        return _load_be_u32(&x);
-#else
-        return (x >> 24) | ((x >> 8) & 0xff00) | ((x & 0xff00) << 8) | (x << 24);
-#endif
-    }
-
-#ifdef __has_attribute
-    __attribute__((target("movbe")))
-#endif
-    inline uint64_t
-    bswap64(uint64_t x)
-    {
-#ifdef _load_be_u64
-        return _load_be_u64(&x);
-#else
-        return (x >> 56) | ((x >> 40) & 0xff00) | ((x >> 24) & 0xff0000) | ((x >> 8) & 0xff000000) |
-               ((x & 0xff000000) << 8) | ((x & 0xff0000) << 24) | ((x & 0xff00) << 40) | (x << 56);
-#endif
-    }
-
     //     inline uint32_t crc32_u8(uint32_t crc, uint8_t data)
     //     {
     // #if defined(HYDRA_ARM)
@@ -229,4 +206,4 @@ namespace hydra
         return splits;
     }
 
-} // namespace hydra
+} // namespace hydra

include/hsystem.h

@@ -18,9 +18,9 @@
 #pragma message("Unknown platform")
 #endif
 
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64) || defined(_M_X64)
 #define HYDRA_X86_64
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__i386) || defined(_M_IX86)
 #define HYDRA_X86
 #elif defined(__arm__) || defined(__aarch64__) || defined(__arm64__)
 #define HYDRA_ARM
@@ -52,4 +52,4 @@
 #define hydra_inline __forceinline
 #else
 #define hydra_inline inline
-#endif
+#endif

qt/keypicker.cxx

@@ -260,8 +260,10 @@ void InputPage::onRemoveButtonClicked()
                 combo->removeItem(index);
             }
 
-            std::string path = Settings::GetSavePath() / "mappings" / (current_name + ".json");
-            if (std::remove(path.c_str()) != 0)
+            auto path = Settings::GetSavePath() / "mappings" / (current_name + ".json");
+            std::error_code ec;
+            std::filesystem::remove(path, ec);
+            if (ec)
             {
                 QMessageBox::warning(this, "Warning",
                                      QString("Failed to remove mapping file: ") + path.c_str());
@@ -583,4 +585,4 @@ void InputPage::set_buttons(ButtonPage page)
             break;
         }
     };
-}
+}