From ad7368fd507090cbcd0942f608a6c25b1f19ffd1 Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Tue, 9 Dec 2025 03:16:29 +0430 Subject: [PATCH] ci fix attempt 2 --- CMakeLists.txt | 9 +++++++-- .../ir/passes/flatten_extended_userdata_pass.cpp | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3421d138..159d1ccae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,7 +239,9 @@ find_package(toml11 4.2.0 CONFIG) find_package(tsl-robin-map 1.3.0 CONFIG) find_package(VulkanHeaders 1.4.329 CONFIG) find_package(VulkanMemoryAllocator 3.1.0 CONFIG) -find_package(xbyak 7.07 CONFIG) +if(ARCHITECTURE STREQUAL "x86_64") + find_package(xbyak 7.07 CONFIG REQUIRED) +endif() find_package(xxHash 0.8.2 MODULE) find_package(ZLIB 1.3 MODULE) find_package(Zydis 5.0.0 CONFIG) @@ -1105,7 +1107,10 @@ add_executable(shadps4 create_target_directory_groups(shadps4) -target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG) +target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG) +if(ARCHITECTURE STREQUAL "x86_64") + target_link_libraries(shadps4 PRIVATE xbyak::xbyak) +endif() target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 SDL3_mixer::SDL3_mixer pugixml::pugixml) target_link_libraries(shadps4 PRIVATE stb::headers libusb::usb lfreist-hwinfo::hwinfo nlohmann_json::nlohmann_json miniz) diff --git a/src/shader_recompiler/ir/passes/flatten_extended_userdata_pass.cpp b/src/shader_recompiler/ir/passes/flatten_extended_userdata_pass.cpp index 90a938639..d4b0593ab 100644 --- a/src/shader_recompiler/ir/passes/flatten_extended_userdata_pass.cpp +++ b/src/shader_recompiler/ir/passes/flatten_extended_userdata_pass.cpp @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "common/arch.h" #include #include #ifdef ARCH_X86_64 #include #include #endif -#include "common/arch.h" #include "common/config.h" #include "common/io_file.h" #include "common/logging/log.h" @@ -23,8 +23,7 @@ #include "shader_recompiler/ir/reg.h" #include "shader_recompiler/ir/srt_gvn_table.h" #include "shader_recompiler/ir/value.h" -#include "src/common/arch.h" -#include "src/common/decoder.h" +#include "common/decoder.h" #ifdef ARCH_X86_64 using namespace Xbyak::util;