From 12a3cdf0e8f47378e11658851d92dc269ca22788 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 7 Mar 2020 13:31:10 +0300 Subject: [PATCH] Move Log.cpp to util/logs.cpp Minor cleanup --- rpcs3/Emu/CMakeLists.txt | 2 +- rpcs3/emucore.vcxproj | 2 +- rpcs3/emucore.vcxproj.filters | 2 +- Utilities/Log.cpp => rpcs3/util/logs.cpp | 7 ++----- 4 files changed, 5 insertions(+), 8 deletions(-) rename Utilities/Log.cpp => rpcs3/util/logs.cpp (99%) diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 42f09d4870..ceba08fe1b 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -31,13 +31,13 @@ target_sources(rpcs3_emu PRIVATE ../util/atomic2.cpp ../util/shared_cptr.cpp ../util/fixed_typemap.cpp + ../util/logs.cpp ../../Utilities/bin_patch.cpp ../../Utilities/cond.cpp ../../Utilities/Config.cpp ../../Utilities/dynamic_library.cpp ../../Utilities/File.cpp ../../Utilities/JIT.cpp - ../../Utilities/Log.cpp ../../Utilities/LUrlParser.cpp ../../Utilities/mutex.cpp ../../Utilities/rXml.cpp diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index a1fd5b0e54..95b4b86483 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -103,7 +103,7 @@ NotUsing - + NotUsing diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index d80f3ce3a0..4aaa51b2de 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -140,7 +140,7 @@ Utilities - + Utilities diff --git a/Utilities/Log.cpp b/rpcs3/util/logs.cpp similarity index 99% rename from Utilities/Log.cpp rename to rpcs3/util/logs.cpp index cf6d787793..15acd43682 100644 --- a/Utilities/Log.cpp +++ b/rpcs3/util/logs.cpp @@ -1,10 +1,7 @@ #include "util/logs.hpp" -#include "File.h" -#include "StrFmt.h" -#include "sema.h" - +#include "Utilities/File.h" +#include "Utilities/mutex.h" #include "Utilities/Thread.h" -#include "rpcs3_version.h" #include #include #include