From ea649bdb1bae6d3ff34e77d3f73573c08766fc20 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 25 Feb 2024 01:53:23 +1000 Subject: [PATCH] Common: Fix duplicate fastjmp on Windows/CMake --- src/common/fastjmp.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/fastjmp.cpp b/src/common/fastjmp.cpp index 6b028b926..893039f02 100644 --- a/src/common/fastjmp.cpp +++ b/src/common/fastjmp.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2021 Connor McLaughlin +// SPDX-FileCopyrightText: 2021-2024 Connor McLaughlin // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) -#if !defined(_MSC_VER) || defined(__clang__) +// Win32 uses Fastjmp.asm, because MSVC doesn't support inline asm. +#if !defined(_WIN32) || defined(_M_ARM64) #include "fastjmp.h"