From 866b7c20a8958069a048ffa600155ec3cbd2e5f2 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 19 Mar 2022 01:50:03 -0400 Subject: [PATCH] general: Fix clang/gcc build errors --- src/common/alignment.h | 1 + src/common/atomic_ops.h | 2 ++ src/common/fs/file.cpp | 1 + src/common/fs/fs_util.cpp | 2 ++ src/common/host_memory.cpp | 1 + src/common/thread.cpp | 1 + src/common/uint128.h | 1 + src/core/crypto/key_manager.h | 5 +---- src/core/file_sys/patch_manager.cpp | 4 ++++ src/shader_recompiler/frontend/ir/opcodes.h | 1 + src/video_core/renderer_vulkan/vk_descriptor_pool.cpp | 1 + src/video_core/textures/astc.cpp | 1 + 12 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/common/alignment.h b/src/common/alignment.h index e4653bf357..8570c7d3c4 100644 --- a/src/common/alignment.h +++ b/src/common/alignment.h @@ -3,6 +3,7 @@ #pragma once #include +#include #include namespace Common { diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h index c488489eae..b94d73c7a6 100644 --- a/src/common/atomic_ops.h +++ b/src/common/atomic_ops.h @@ -8,6 +8,8 @@ #if _MSC_VER #include +#else +#include #endif namespace Common { diff --git a/src/common/fs/file.cpp b/src/common/fs/file.cpp index b89e785c2e..5d71275ef2 100644 --- a/src/common/fs/file.cpp +++ b/src/common/fs/file.cpp @@ -8,6 +8,7 @@ #ifdef _WIN32 #include +#include #else #include #endif diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp index 1f47c2310d..0068112e63 100644 --- a/src/common/fs/fs_util.cpp +++ b/src/common/fs/fs_util.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include "common/fs/fs_util.h" namespace Common::FS { diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 229fbe91ee..e829af1acc 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -18,6 +18,7 @@ #include #include #include +#include "common/scope_exit.h" #endif // ^^^ Linux ^^^ diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 91c8a8e13f..946a1114d5 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -4,6 +4,7 @@ #include +#include "common/error.h" #include "common/logging/log.h" #include "common/thread.h" #ifdef __APPLE__ diff --git a/src/common/uint128.h b/src/common/uint128.h index 1ed5d65079..ad1b90414b 100644 --- a/src/common/uint128.h +++ b/src/common/uint128.h @@ -12,6 +12,7 @@ #pragma intrinsic(_umul128) #pragma intrinsic(_udiv128) #else +#include #include #endif diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index 34ea5bbd4c..ac1eb89627 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include #include @@ -15,10 +16,6 @@ #include "common/common_types.h" #include "core/crypto/partition_data_manager.h" -namespace std::filesystem { -class path; -} - namespace Common::FS { class IOFile; } diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 5882b971b7..c4e1857570 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -10,6 +10,10 @@ #include "common/hex_util.h" #include "common/logging/log.h" #include "common/settings.h" +#ifndef _WIN32 +#include "common/string_util.h" +#endif + #include "core/core.h" #include "core/file_sys/common_funcs.h" #include "core/file_sys/content_archive.h" diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h index 9de65c8b29..85f7aac02e 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.h +++ b/src/shader_recompiler/frontend/ir/opcodes.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include diff --git a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp index 60e45f1b93..d87da2a34a 100644 --- a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 25161df1f6..28e4beafde 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -16,6 +16,7 @@ // #include +#include #include #include #include