mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-24 19:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved config to config folder

Browse Source
This commit is contained in:
georgemoralis 2024-03-09 18:59:08 +02:00
parent 771c07a026
commit fb48626d7e
8 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -186,6 +186,8 @@ set(COMMON src/common/logging/backend.cpp
src/common/assert.h src/common/assert.h
src/common/bounded_threadsafe_queue.h src/common/bounded_threadsafe_queue.h
src/common/concepts.h src/common/concepts.h
src/common/config.cpp
src/common/config.h
src/common/debug.h src/common/debug.h
src/common/disassembler.cpp src/common/disassembler.cpp
src/common/disassembler.h src/common/disassembler.h
@ -229,10 +231,6 @@ set(FILE_FORMAT src/core/file_format/pfs.h
src/core/file_format/psf.h src/core/file_format/psf.h
) )
set(UTILITIES src/Util/config.cpp
src/Util/config.h
)
if(ENABLE_QT_GUI) if(ENABLE_QT_GUI)
qt_add_executable(shadps4 qt_add_executable(shadps4
${QT_GUI} ${QT_GUI}
@ -240,7 +238,6 @@ qt_add_executable(shadps4
${CORE} ${CORE}
${CRYPTO} ${CRYPTO}
${FILE_FORMAT} ${FILE_FORMAT}
${UTILITIES}
) )
else() else()
add_executable(shadps4 add_executable(shadps4
@ -308,7 +305,6 @@ add_executable(shadps4
${CORE} ${CORE}
${CRYPTO} ${CRYPTO}
${FILE_FORMAT} ${FILE_FORMAT}
${UTILITIES}
) )
endif() endif()

0
src/Util/config.cpp → src/common/config.cpp
View File

2
src/Util/config.h → src/common/config.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <filesystem> #include <filesystem>
#include "common/types.h" #include "types.h"
namespace Config { namespace Config {
void load(const std::filesystem::path& path); void load(const std::filesystem::path& path);

2
src/common/logging/backend.cpp
View File

@ -6,13 +6,13 @@
#include <thread> #include <thread>
#include <fmt/format.h> #include <fmt/format.h>
#include "Util/config.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> // For OutputDebugStringW #include <windows.h> // For OutputDebugStringW
#endif #endif
#include "common/bounded_threadsafe_queue.h" #include "common/bounded_threadsafe_queue.h"
#include "common/config.h"
#include "common/io_file.h" #include "common/io_file.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/logging/log.h" #include "common/logging/log.h"

2
src/core/PS4/HLE/Graphics/video_out.cpp
View File

@ -4,7 +4,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "Objects/video_out_ctx.h" #include "Objects/video_out_ctx.h"
#include "Util/config.h" #include "common/config.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/singleton.h" #include "common/singleton.h"

4
src/core/aerolib/stubs.cpp
View File

@ -19,7 +19,7 @@ namespace Core::AeroLib {
// and to longer compile / CI times // and to longer compile / CI times
// //
// Must match STUBS_LIST define // Must match STUBS_LIST define
constexpr u32 MAX_STUBS = 128; constexpr u32 MAX_STUBS = 512;
u64 UnresolvedStub() { u64 UnresolvedStub() {
LOG_ERROR(Core, "Returning zero to {}", __builtin_return_address(0)); LOG_ERROR(Core, "Returning zero to {}", __builtin_return_address(0));
@ -61,7 +61,7 @@ static u32 UsedStubEntries;
#define XREP_256(x) XREP_128(x) XREP_128(x + 128) #define XREP_256(x) XREP_128(x) XREP_128(x + 128)
#define XREP_512(x) XREP_256(x) XREP_256(x + 256) #define XREP_512(x) XREP_256(x) XREP_256(x + 256)
#define STUBS_LIST XREP_128(0) #define STUBS_LIST XREP_512(0)
static u64 (*stub_handlers[MAX_STUBS])() = {STUBS_LIST}; static u64 (*stub_handlers[MAX_STUBS])() = {STUBS_LIST};

2
src/core/hle/kernel/cpu_management.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "Util/config.h" #include "common/config.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/hle/kernel/cpu_management.h" #include "core/hle/kernel/cpu_management.h"

2
src/main.cpp
View File

@ -10,7 +10,7 @@
#include <thread> #include <thread>
#include <core/hle/libraries/libkernel/thread_management.h> #include <core/hle/libraries/libkernel/thread_management.h>
#include "Util/config.h" #include "common/config.h"
#include "common/discord.h" #include "common/discord.h"
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/path_util.h" #include "common/path_util.h"