From 1e57ccc6ecabe6a8a673df7db9e7792b3bd05ca3 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Fri, 4 Aug 2023 11:33:00 +0300 Subject: [PATCH] refactoring --- CMakeLists.txt | 4 +++- src/Core/PS4/Linker.cpp | 2 +- src/Util/{StringUtil.cpp => string_util.cpp} | 3 ++- src/Util/{StringUtil.h => string_util.h} | 0 4 files changed, 6 insertions(+), 3 deletions(-) rename src/Util/{StringUtil.cpp => string_util.cpp} (91%) rename src/Util/{StringUtil.h => string_util.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 202f1d4d..478d5901 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,9 @@ add_executable(shadps4 src/Lib/Threads.h src/Core/PS4/HLE/Kernel/Objects/physical_memory.h src/Core/PS4/HLE/Kernel/Objects/physical_memory.cpp - "src/Util/Singleton.h" "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Util/StringUtil.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Lib/Timer.cpp" "src/Lib/Timer.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceVideoOut.cpp" "src/Core/PS4/HLE/LibSceVideoOut.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h" "src/Core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/Core/PS4/HLE/Kernel/ThreadManagement.h" "src/Core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/Core/PS4/HLE/Kernel/memory_management.cpp" "src/Core/PS4/HLE/Kernel/memory_management.h" "src/Util/StringUtil.cpp") + src/Util/string_util.cpp + src/Util/string_util.cpp + "src/Util/Singleton.h" "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Lib/Timer.cpp" "src/Lib/Timer.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceVideoOut.cpp" "src/Core/PS4/HLE/LibSceVideoOut.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h" "src/Core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/Core/PS4/HLE/Kernel/ThreadManagement.h" "src/Core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/Core/PS4/HLE/Kernel/memory_management.cpp" "src/Core/PS4/HLE/Kernel/memory_management.h") find_package(OpenGL REQUIRED) target_link_libraries(shadps4 PUBLIC fmt spdlog IMGUI SDL3-shared ${OPENGL_LIBRARY}) diff --git a/src/Core/PS4/Linker.cpp b/src/Core/PS4/Linker.cpp index b170af8a..1de6c619 100644 --- a/src/Core/PS4/Linker.cpp +++ b/src/Core/PS4/Linker.cpp @@ -2,7 +2,7 @@ #include "../Memory.h" #include "../../Util/Log.h" #include "../../Util/Disassembler.h" -#include "../../Util/StringUtil.h" +#include #include "Util/aerolib.h" #include "Loader/SymbolsResolver.h" #include "HLE/Kernel/ThreadManagement.h" diff --git a/src/Util/StringUtil.cpp b/src/Util/string_util.cpp similarity index 91% rename from src/Util/StringUtil.cpp rename to src/Util/string_util.cpp index e3ebb756..c1b1b6cf 100644 --- a/src/Util/StringUtil.cpp +++ b/src/Util/string_util.cpp @@ -1,4 +1,5 @@ -#include "StringUtil.h" +#include "string_util.h" + #include #include #include diff --git a/src/Util/StringUtil.h b/src/Util/string_util.h similarity index 100% rename from src/Util/StringUtil.h rename to src/Util/string_util.h