From 7edbaf5f69249d811ff648c9d7a3335d9dd6787e Mon Sep 17 00:00:00 2001 From: Skyth <19259897+blueskythlikesclouds@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:09:14 +0300 Subject: [PATCH] Don't compile header-only libraries. --- UnleashedRecomp/CMakeLists.txt | 9 ++++----- UnleashedRecomp/gpu/video.cpp | 2 +- UnleashedRecomp/gpu/video.h | 2 +- thirdparty/CMakeLists.txt | 7 +------ 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index a75dc3c0..d28a29fb 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -207,11 +207,14 @@ set(SWA_THIRDPARTY_INCLUDES "${SWA_THIRDPARTY_ROOT}/ddspp" "${SWA_THIRDPARTY_ROOT}/imgui" "${SWA_THIRDPARTY_ROOT}/libmspack/libmspack/mspack" - "${SWA_THIRDPARTY_ROOT}/miniaudio" + "${SWA_THIRDPARTY_ROOT}/magic_enum/include" "${SWA_THIRDPARTY_ROOT}/miniaudio" "${SWA_THIRDPARTY_ROOT}/stb" "${SWA_THIRDPARTY_ROOT}/tiny-AES-c" "${SWA_THIRDPARTY_ROOT}/TinySHA1" + "${SWA_THIRDPARTY_ROOT}/unordered_dense/include" + "${SWA_THIRDPARTY_ROOT}/volk" + "${SWA_THIRDPARTY_ROOT}/Vulkan-Headers/include" "${SWA_THIRDPARTY_ROOT}/VulkanMemoryAllocator/include" "${SWA_TOOLS_ROOT}/bc_diff" "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source" @@ -298,7 +301,6 @@ endif() target_link_libraries(UnleashedRecomp PRIVATE fmt::fmt libzstd_static - magic_enum::magic_enum msdf-atlas-gen::msdf-atlas-gen nfd::nfd o1heap @@ -306,10 +308,7 @@ target_link_libraries(UnleashedRecomp PRIVATE SDL2::SDL2-static tomlplusplus::tomlplusplus UnleashedRecompLib - unordered_dense::unordered_dense - volk::volk_headers Vorbis::vorbisfile - Vulkan::Headers xxHash::xxhash ) target_include_directories(UnleashedRecomp PRIVATE diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp index 4aee20cf..2e9ebba2 100644 --- a/UnleashedRecomp/gpu/video.cpp +++ b/UnleashedRecomp/gpu/video.cpp @@ -31,7 +31,7 @@ #include #if defined(ASYNC_PSO_DEBUG) || defined(PSO_CACHING) -#include +#include #endif #include "../../tools/ShaderRecomp/ShaderRecomp/shader_common.h" diff --git a/UnleashedRecomp/gpu/video.h b/UnleashedRecomp/gpu/video.h index a77af7de..7dd293c7 100644 --- a/UnleashedRecomp/gpu/video.h +++ b/UnleashedRecomp/gpu/video.h @@ -1,7 +1,7 @@ #pragma once //#define ASYNC_PSO_DEBUG -//#define PSO_CACHING +#define PSO_CACHING #include "rhi/plume_render_interface.h" diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index be176f05..28f000da 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,16 +1,11 @@ -add_subdirectory("${SWA_THIRDPARTY_ROOT}/magic_enum") - set(MSDF_ATLAS_BUILD_STANDALONE OFF) set(MSDF_ATLAS_USE_SKIA OFF) set(MSDF_ATLAS_NO_ARTERY_FONT ON) set(MSDFGEN_DISABLE_PNG ON) -add_subdirectory("${SWA_THIRDPARTY_ROOT}/msdf-atlas-gen") +add_subdirectory("${SWA_THIRDPARTY_ROOT}/msdf-atlas-gen") add_subdirectory("${SWA_THIRDPARTY_ROOT}/nativefiledialog-extended") add_subdirectory("${SWA_THIRDPARTY_ROOT}/ogg") add_subdirectory("${SWA_THIRDPARTY_ROOT}/o1heap") add_subdirectory("${SWA_THIRDPARTY_ROOT}/SDL") -add_subdirectory("${SWA_THIRDPARTY_ROOT}/unordered_dense") -add_subdirectory("${SWA_THIRDPARTY_ROOT}/volk") add_subdirectory("${SWA_THIRDPARTY_ROOT}/vorbis") -add_subdirectory("${SWA_THIRDPARTY_ROOT}/Vulkan-Headers")