catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #211 from abouvier/fix-include 

fix system include paths
This commit is contained in:
psucien 2024-06-26 14:02:50 +02:00 committed by GitHub
parent 8f45be7d44 a2224a9b6b
commit 5ed0794c20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
externals/CMakeLists.txt vendored
View File

@ -28,9 +28,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC)
target_include_directories(cryptoppwin INTERFACE cryptoppwin/include) target_include_directories(cryptoppwin INTERFACE cryptoppwin/include)
else() else()
# CryptoPP # CryptoPP
set(CRYPTOPP_INSTALL OFF)
set(CRYPTOPP_BUILD_TESTING OFF) set(CRYPTOPP_BUILD_TESTING OFF)
set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/) set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/)
add_subdirectory(cryptopp-cmake EXCLUDE_FROM_ALL) add_subdirectory(cryptopp-cmake EXCLUDE_FROM_ALL)
file(COPY cryptopp DESTINATION cryptopp FILES_MATCHING PATTERN "*.h")
target_include_directories(cryptopp INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/cryptopp")
endif() endif()
# Zlib-Ng # Zlib-Ng
@ -60,6 +63,8 @@ set(ENABLE_HLSL OFF CACHE BOOL "")
set(BUILD_EXTERNAL OFF CACHE BOOL "") set(BUILD_EXTERNAL OFF CACHE BOOL "")
set(ENABLE_OPT OFF CACHE BOOL "") set(ENABLE_OPT OFF CACHE BOOL "")
add_subdirectory(glslang) add_subdirectory(glslang)
file(COPY glslang/SPIRV DESTINATION glslang/glslang FILES_MATCHING PATTERN "*.h")
target_include_directories(SPIRV INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/glslang")
# Robin-map # Robin-map
add_subdirectory(robin-map EXCLUDE_FROM_ALL) add_subdirectory(robin-map EXCLUDE_FROM_ALL)

2
externals/cryptoppwin vendored

@ -1 +1 @@
Subproject commit 0dd224c6812cd038e9f4691d2f869dd57b547ff1 Subproject commit bc3441dd2d6a9728e747dc0180bc8b9065a2923c

14
src/core/crypto/crypto.h
View File

@ -4,13 +4,13 @@
#pragma once #pragma once
#include <span> #include <span>
#include <aes.h> #include <cryptopp/aes.h>
#include <filters.h> #include <cryptopp/filters.h>
#include <modes.h> #include <cryptopp/modes.h>
#include <oaep.h> #include <cryptopp/oaep.h>
#include <osrng.h> #include <cryptopp/osrng.h>
#include <rsa.h> #include <cryptopp/rsa.h>
#include <sha.h> #include <cryptopp/sha.h>
#include "common/types.h" #include "common/types.h"
#include "keys.h" #include "keys.h"

2
src/core/crypto/keys.h
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include <rsa.h> #include <cryptopp/rsa.h>
class FakeKeyset { class FakeKeyset {
public: public:

2
src/video_core/renderer_vulkan/vk_shader_util.cpp
View File

@ -2,9 +2,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <memory> #include <memory>
#include <SPIRV/GlslangToSpv.h>
#include <glslang/Include/ResourceLimits.h> #include <glslang/Include/ResourceLimits.h>
#include <glslang/Public/ShaderLang.h> #include <glslang/Public/ShaderLang.h>
#include <glslang/SPIRV/GlslangToSpv.h>
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "video_core/renderer_vulkan/vk_shader_util.h" #include "video_core/renderer_vulkan/vk_shader_util.h"