From d67ea484f7a30d4323035c3301b838e554b20c2d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 15:57:10 -0400 Subject: [PATCH 1/6] Common: Get rid of compiler semantic asserts They were never used. --- Source/Core/Common/Common.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index bb53de30c24..16d53b00e28 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -34,28 +34,6 @@ extern const char *netplay_dolphin_ver; #define UNUSED #endif -#if defined(__GNUC__) || __clang__ - #define EXPECT(x, y) __builtin_expect(x, y) - #define LIKELY(x) __builtin_expect(!!(x), 1) - #define UNLIKELY(x) __builtin_expect(!!(x), 0) - // Careful, wrong assumptions result in undefined behavior! - #define UNREACHABLE __builtin_unreachable() - // Careful, wrong assumptions result in undefined behavior! - #define ASSUME(x) do { if (!x) __builtin_unreachable(); } while (0) -#else - #define EXPECT(x, y) (x) - #define LIKELY(x) (x) - #define UNLIKELY(x) (x) - // Careful, wrong assumptions result in undefined behavior! - #define UNREACHABLE ASSUME(0) - #if defined(_MSC_VER) - // Careful, wrong assumptions result in undefined behavior! - #define ASSUME(x) __assume(x) - #else - #define ASSUME(x) do { void(x); } while (0) - #endif -#endif - // An inheritable class to disallow the copy constructor and operator= functions class NonCopyable { From bb927ad738ffc742ae9538a1b2d41d6de66dc6fa Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 15:59:36 -0400 Subject: [PATCH 2/6] Atomic_GCC: Throw out old code --- Source/Core/Common/Atomic_GCC.h | 13 ------------- Source/Core/Common/Common.h | 4 ---- 2 files changed, 17 deletions(-) diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h index b075345c56f..5e0f6e8e4a4 100644 --- a/Source/Core/Common/Atomic_GCC.h +++ b/Source/Core/Common/Atomic_GCC.h @@ -50,19 +50,6 @@ inline void AtomicOr(volatile u32& target, u32 value) __sync_or_and_fetch(&target, value); } -// Support clang versions older than 3.4. -#if __clang__ && !__has_feature(cxx_atomic) -template -_Atomic(T)* ToC11Atomic(volatile T* loc) -{ - return (_Atomic(T)*) loc; -} - -#define __atomic_load_n(p, m) __c11_atomic_load(ToC11Atomic(p), m) -#define __atomic_store_n(p, v, m) __c11_atomic_store(ToC11Atomic(p), v, m) -#define __atomic_exchange_n(p, v, m) __c11_atomic_exchange(ToC11Atomic(p), v, m) -#endif - #ifndef __ATOMIC_RELAXED #error __ATOMIC_RELAXED not defined; your compiler version is too old. #endif diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 16d53b00e28..c93cf4fa48f 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -8,10 +8,6 @@ #include #include -#ifndef __has_feature -#define __has_feature(x) 0 -#endif - // Git version number extern const char *scm_desc_str; extern const char *scm_branch_str; From 1d42db24398f7d94a6c9c641225d8088d203a3ea Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 16:13:54 -0400 Subject: [PATCH 3/6] Common: Move NonCopyable to its own header --- Source/Core/AudioCommon/WaveFile.h | 1 + Source/Core/Common/CodeBlock.h | 1 + Source/Core/Common/Common.h | 12 ------------ Source/Core/Common/Common.vcxproj | 1 + Source/Core/Common/FileUtil.h | 1 + Source/Core/Common/Logging/LogManager.h | 1 + Source/Core/Common/NonCopyable.h | 17 +++++++++++++++++ Source/Core/Common/PcapFile.h | 1 + Source/Core/Core/ConfigManager.h | 1 + Source/Core/Core/DSP/DSPCaptureLogger.h | 3 ++- Source/Core/Core/HW/GCMemcard.h | 1 + Source/Core/Core/HW/GCMemcardDirectory.h | 1 + Source/Core/Core/HW/MMIOHandlers.h | 1 + Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 1 + Source/Core/Core/IPC_HLE/WII_Socket.h | 2 ++ Source/Core/VideoBackends/OGL/SamplerCache.h | 3 ++- .../Core/VideoBackends/Software/SWVideoConfig.h | 3 ++- Source/Core/VideoCommon/NativeVertexFormat.h | 4 +++- 18 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 Source/Core/Common/NonCopyable.h diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index 02ed48ced7a..90ab26c9ea5 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -17,6 +17,7 @@ #include #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/NonCopyable.h" class WaveFileWriter : NonCopyable { diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h index 5a7df9b87f7..864dac5e633 100644 --- a/Source/Core/Common/CodeBlock.h +++ b/Source/Core/Common/CodeBlock.h @@ -6,6 +6,7 @@ #include "Common/Common.h" #include "Common/MemoryUtil.h" +#include "Common/NonCopyable.h" // Everything that needs to generate code should inherit from this. // You get memory management for free, plus, you can use all emitter functions without diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index c93cf4fa48f..4a23e71c773 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -30,18 +30,6 @@ extern const char *netplay_dolphin_ver; #define UNUSED #endif -// An inheritable class to disallow the copy constructor and operator= functions -class NonCopyable -{ -protected: - constexpr NonCopyable() = default; - ~NonCopyable() = default; - -private: - NonCopyable(NonCopyable&) = delete; - NonCopyable& operator=(NonCopyable&) = delete; -}; - #if defined _WIN32 // Memory leak checks diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index fe95d75289e..12cbc07e8a9 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -106,6 +106,7 @@ + diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index ce8598a8221..4bb8bf63a8e 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -11,6 +11,7 @@ #include #include "Common/Common.h" +#include "Common/NonCopyable.h" #ifdef _WIN32 #include "Common/StringUtil.h" diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h index c03610ae02d..af2ad40cc04 100644 --- a/Source/Core/Common/Logging/LogManager.h +++ b/Source/Core/Common/Logging/LogManager.h @@ -11,6 +11,7 @@ #include #include "Common/Common.h" +#include "Common/NonCopyable.h" #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 diff --git a/Source/Core/Common/NonCopyable.h b/Source/Core/Common/NonCopyable.h new file mode 100644 index 00000000000..9fc1456a4ed --- /dev/null +++ b/Source/Core/Common/NonCopyable.h @@ -0,0 +1,17 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +// An inheritable class to disallow the copy constructor and operator= functions +class NonCopyable +{ +protected: + constexpr NonCopyable() = default; + ~NonCopyable() = default; + +private: + NonCopyable(NonCopyable&) = delete; + NonCopyable& operator=(NonCopyable&) = delete; +}; diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h index 7e1ecdf6b4b..39d2abcc44f 100644 --- a/Source/Core/Common/PcapFile.h +++ b/Source/Core/Common/PcapFile.h @@ -18,6 +18,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/NonCopyable.h" class PCAP final : public NonCopyable { diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 06bd03e92c0..1714d7a8805 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -8,6 +8,7 @@ #include #include "Common/IniFile.h" +#include "Common/NonCopyable.h" #include "Common/SysConf.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/SI_Device.h" diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h index a5028352b2f..79e97cf8a8c 100644 --- a/Source/Core/Core/DSP/DSPCaptureLogger.h +++ b/Source/Core/Core/DSP/DSPCaptureLogger.h @@ -7,7 +7,8 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" class PCAP; diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index cdd760f2cfc..d3077d34ccb 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -10,6 +10,7 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/NandPaths.h" +#include "Common/NonCopyable.h" #include "Common/StringUtil.h" #include "Core/HW/EXI_DeviceIPL.h" diff --git a/Source/Core/Core/HW/GCMemcardDirectory.h b/Source/Core/Core/HW/GCMemcardDirectory.h index 2ddbfa4a1b4..45aaa0628b0 100644 --- a/Source/Core/Core/HW/GCMemcardDirectory.h +++ b/Source/Core/Core/HW/GCMemcardDirectory.h @@ -12,6 +12,7 @@ #include #include "Common/Event.h" +#include "Common/NonCopyable.h" #include "Core/HW/GCMemcard.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h index 54cadf11cd4..2a72608232f 100644 --- a/Source/Core/Core/HW/MMIOHandlers.h +++ b/Source/Core/Core/HW/MMIOHandlers.h @@ -8,6 +8,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" // All the templated and very repetitive MMIO-related code is isolated in this // file for easier reading. It mostly contains code related to handling methods diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 5fc1ca90459..9a63991550f 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -12,6 +12,7 @@ #include #include "Common/FifoQueue.h" +#include "Common/NonCopyable.h" #include "Common/Timer.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index a5bc095c484..c12995ed2ed 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -47,6 +47,8 @@ typedef struct pollfd pollfd_t; #include #include +#include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index 05a4836fcf5..bb4a7353aba 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -6,8 +6,9 @@ #include +#include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" #include "Common/GL/GLUtil.h" - #include "VideoBackends/OGL/Render.h" namespace OGL diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h index 7a58af41a6d..4dfa8ac87dd 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.h +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h @@ -4,7 +4,8 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/NonCopyable.h" #define STATISTICS 1 diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index c64d94fa77c..df86b90946e 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -4,10 +4,12 @@ #pragma once +#include #include // for hash -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Hash.h" +#include "Common/NonCopyable.h" // m_components enum From 867df74b52cd03b1f82572d7870ca034476e7d89 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 16:15:49 -0400 Subject: [PATCH 4/6] Common: Remove strdup define It's not used anywhere. --- Source/Core/Common/Common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 4a23e71c773..27427d3011d 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -64,11 +64,9 @@ extern const char *netplay_dolphin_ver; #endif #ifdef _MSC_VER -#define __strdup _strdup #define __getcwd _getcwd #define __chdir _chdir #else -#define __strdup strdup #define __getcwd getcwd #define __chdir chdir #endif From 19ac565e0dafccd3728b58a0d92cdc0cb74e4be0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 16:39:47 -0400 Subject: [PATCH 5/6] Common: Move asserts to their own header --- Source/Core/Common/Arm64Emitter.cpp | 1 + Source/Core/Common/Arm64Emitter.h | 1 + Source/Core/Common/Assert.h | 45 +++++++++++++++++++ Source/Core/Common/ChunkFile.h | 2 + Source/Core/Common/CodeBlock.h | 2 +- Source/Core/Common/Common.vcxproj | 1 + Source/Core/Common/GL/GLUtil.cpp | 1 + Source/Core/Common/Logging/Log.h | 41 ----------------- Source/Core/Common/x64Emitter.h | 1 + Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 2 +- .../Core/FifoPlayer/FifoPlaybackAnalyzer.cpp | 3 +- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 1 + .../Core/FifoPlayer/FifoRecordAnalyzer.cpp | 2 +- Source/Core/Core/HW/MMIO.h | 1 + Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp | 3 +- .../Core/PowerPC/Interpreter/Interpreter.cpp | 2 + .../Interpreter/Interpreter_Branch.cpp | 2 + .../Interpreter_LoadStorePaired.cpp | 2 + .../Interpreter_SystemRegisters.cpp | 2 + Source/Core/DiscIO/VolumeDirectory.cpp | 2 + Source/Core/DiscIO/WiiWad.cpp | 1 + Source/Core/DolphinWX/FifoPlayerDlg.cpp | 1 + .../ControllerInterface/evdev/evdev.cpp | 1 + 23 files changed, 73 insertions(+), 47 deletions(-) create mode 100644 Source/Core/Common/Assert.h diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index aa01434b436..16031372f4e 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -6,6 +6,7 @@ #include #include "Common/Arm64Emitter.h" +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/MathUtil.h" diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index 8ca8c001a03..3cb5dfe0a82 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -7,6 +7,7 @@ #include #include "Common/ArmCommon.h" +#include "Common/Assert.h" #include "Common/BitSet.h" #include "Common/CodeBlock.h" #include "Common/Common.h" diff --git a/Source/Core/Common/Assert.h b/Source/Core/Common/Assert.h new file mode 100644 index 00000000000..bedcbdee48b --- /dev/null +++ b/Source/Core/Common/Assert.h @@ -0,0 +1,45 @@ +// Copyright 2015 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#pragma once + +#include "Common/CommonFuncs.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" + +#ifdef _WIN32 +#define _assert_msg_(_t_, _a_, _fmt_, ...) \ + if (!(_a_)) {\ + if (!PanicYesNo(_fmt_, __VA_ARGS__)) \ + Crash(); \ + } + +#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ + if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ + ERROR_LOG(_t_, _msg_, __VA_ARGS__); \ + if (!PanicYesNo(_msg_, __VA_ARGS__)) \ + Crash(); \ + } +#else +#define _assert_msg_(_t_, _a_, _fmt_, ...) \ + if (!(_a_)) {\ + if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \ + Crash(); \ + } + +#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ + if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ + ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \ + if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \ + Crash(); \ + } +#endif + +#define _assert_(_a_) \ + _assert_msg_(MASTER_LOG, _a_, "Error...\n\n Line: %d\n File: %s\n Time: %s\n\nIgnore and continue?", \ + __LINE__, __FILE__, __TIME__) + +#define _dbg_assert_(_t_, _a_) \ + if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \ + _assert_(_a_) diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index fcf1bdb3e48..d3babbb11d4 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -24,9 +24,11 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Flag.h" +#include "Common/Logging/Log.h" // ewww #if _LIBCPP_VERSION || __GNUC__ >= 5 diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h index 864dac5e633..8f02f083366 100644 --- a/Source/Core/Common/CodeBlock.h +++ b/Source/Core/Common/CodeBlock.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/Assert.h" #include "Common/MemoryUtil.h" #include "Common/NonCopyable.h" diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 12cbc07e8a9..f367557b2e4 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -35,6 +35,7 @@ + diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp index 3cb8499b0d6..ece39e5a61b 100644 --- a/Source/Core/Common/GL/GLUtil.cpp +++ b/Source/Core/Common/GL/GLUtil.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" #include "Common/GL/GLInterfaceBase.h" #include "Common/GL/GLUtil.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index 41d9aa503a8..24a4aa8884e 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -4,9 +4,6 @@ #pragma once -#include "Common/CommonFuncs.h" -#include "Common/MsgHandler.h" - namespace LogTypes { @@ -101,41 +98,3 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, #define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0) #define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0) #define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0) - -#ifdef _WIN32 -#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ - ERROR_LOG(_t_, _msg_, __VA_ARGS__); \ - if (!PanicYesNo(_msg_, __VA_ARGS__)) \ - Crash(); \ - } -#else -#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\ - ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \ - if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \ - Crash(); \ - } -#endif - -#ifdef _WIN32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ - if (!(_a_)) {\ - if (!PanicYesNo(_fmt_, __VA_ARGS__)) \ - Crash(); \ - } -#else // not win32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ - if (!(_a_)) {\ - if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \ - Crash(); \ - } -#endif // WIN32 - -#define _assert_(_a_) \ - _assert_msg_(MASTER_LOG, _a_, "Error...\n\n Line: %d\n File: %s\n Time: %s\n\nIgnore and continue?", \ - __LINE__, __FILE__, __TIME__) - -#define _dbg_assert_(_t_, _a_) \ - if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \ - _assert_(_a_) diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index cd6a2bd03c9..928478af49c 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -10,6 +10,7 @@ #include #include +#include "Common/Assert.h" #include "Common/BitSet.h" #include "Common/CodeBlock.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index 05eb13cce5c..40cdcdf49e8 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/FifoPlayer/FifoAnalyzer.h" - #include "VideoCommon/VertexLoader.h" #include "VideoCommon/VertexLoader_Normal.h" #include "VideoCommon/VertexLoader_Position.h" diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp index 4ca0335fe00..462cbae576a 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" #include "Common/CommonTypes.h" - #include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" - #include "VideoCommon/OpcodeDecoding.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index f4bef742a79..1d2cdaa76ec 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -5,6 +5,7 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index e92b94e8d88..f13b0cdf48c 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -4,12 +4,12 @@ #include +#include "Common/Assert.h" #include "Core/Core.h" #include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoRecordAnalyzer.h" #include "Core/FifoPlayer/FifoRecorder.h" #include "Core/HW/Memmap.h" - #include "VideoCommon/OpcodeDecoding.h" #include "VideoCommon/TextureDecoder.h" diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h index b03a42f09e4..25b5a1e0cb7 100644 --- a/Source/Core/Core/HW/MMIO.h +++ b/Source/Core/Core/HW/MMIO.h @@ -8,6 +8,7 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/HW/MMIOHandlers.h" diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp index 1803fb1933e..33f994e45fa 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp @@ -4,7 +4,8 @@ #include -#include "Common/Common.h" +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/Logging/Log.h" #include "Core/IPC_HLE/WiiMote_HID_Attr.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index 50f7fe721bf..76e4c2b59a4 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -6,6 +6,8 @@ #include #include +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Common/GekkoDisassembler.h" #include "Common/StringUtil.h" #include "Core/Host.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp index 8726da7320e..842c4ec8639 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/Interpreter/Interpreter.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index d280faca211..4b13a1550b3 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 08f165bcde0..5b27df0a406 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/FPURoundMode.h" #include "Core/HW/GPFifo.h" diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index eadb198eeb8..8be726fd661 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -10,10 +10,12 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/FileBlob.h" #include "DiscIO/FileMonitor.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index f6b8574983a..a7ba92b2fb8 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -7,6 +7,7 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index 0ab444c7c8c..0ad790d7209 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -25,6 +25,7 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index 3d452448472..d88a44b7ef7 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -7,6 +7,7 @@ #include #include +#include "Common/Assert.h" #include "Common/Logging/Log.h" #include "InputCommon/ControllerInterface/evdev/evdev.h" From cc036ca86cdaf709e01221975da734cb64d54a94 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 17:13:07 -0400 Subject: [PATCH 6/6] Common: Remove other Common prefixed headers from Common.h --- Source/Core/AudioCommon/AOSoundStream.cpp | 2 ++ Source/Core/AudioCommon/AlsaSoundStream.cpp | 1 + Source/Core/AudioCommon/AudioCommon.cpp | 4 ++-- .../Core/AudioCommon/CoreAudioSoundStream.cpp | 1 + Source/Core/AudioCommon/Mixer.cpp | 12 ++++++++++++ Source/Core/AudioCommon/Mixer.h | 17 +++-------------- Source/Core/AudioCommon/OpenALStream.cpp | 1 + Source/Core/AudioCommon/OpenSLESStream.cpp | 2 ++ Source/Core/AudioCommon/PulseAudioStream.cpp | 1 + Source/Core/AudioCommon/SoundStream.h | 1 + Source/Core/AudioCommon/WaveFile.cpp | 1 + Source/Core/AudioCommon/XAudio2Stream.cpp | 2 ++ Source/Core/AudioCommon/XAudio2_7Stream.cpp | 2 ++ Source/Core/AudioCommon/aldlist.cpp | 3 ++- Source/Core/Common/ChunkFile.h | 1 + Source/Core/Common/Common.h | 5 ----- Source/Core/Common/FileUtil.cpp | 2 ++ Source/Core/Common/FileUtil.h | 2 +- Source/Core/Common/GL/GLInterface/EGL.cpp | 1 + Source/Core/Common/GL/GLInterface/EGLX11.cpp | 1 + Source/Core/Common/GL/GLInterface/WGL.cpp | 1 + Source/Core/Common/IniFile.h | 1 + .../Core/Common/Logging/ConsoleListenerNix.cpp | 1 + Source/Core/Common/Logging/LogManager.h | 3 ++- Source/Core/Common/MemArena.cpp | 2 ++ Source/Core/Common/MsgHandler.cpp | 2 ++ Source/Core/Common/NandPaths.cpp | 2 ++ Source/Core/Common/SDCardUtil.cpp | 2 ++ Source/Core/Common/StringUtil.cpp | 2 ++ Source/Core/Common/StringUtil.h | 2 +- Source/Core/Common/SysConf.cpp | 2 ++ Source/Core/Common/SysConf.h | 4 +++- Source/Core/Common/TraversalClient.cpp | 2 ++ Source/Core/Core/HLE/HLE_OS.cpp | 3 ++- Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp | 1 + Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp | 1 + Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp | 3 ++- Source/Core/Core/HW/EXI_DeviceMic.cpp | 1 + Source/Core/Core/HW/GCMemcard.cpp | 2 ++ Source/Core/Core/HW/GCMemcard.h | 1 + Source/Core/Core/HW/SI_Device.cpp | 1 + Source/Core/Core/HW/WiiSaveCrypted.cpp | 3 +++ Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 1 + Source/Core/Core/ec_wii.cpp | 2 +- Source/Core/DiscIO/CompressedBlob.cpp | 2 ++ Source/Core/DiscIO/DiscScrubber.cpp | 1 + Source/Core/DiscIO/DriveBlob.cpp | 2 ++ Source/Core/DiscIO/FileSystemGCWii.cpp | 3 ++- Source/Core/DiscIO/NANDContentLoader.cpp | 1 + Source/Core/DiscIO/VolumeCreator.cpp | 2 +- Source/Core/DiscIO/VolumeGC.cpp | 1 + Source/Core/DiscIO/VolumeWad.cpp | 2 ++ Source/Core/DiscIO/WbfsBlob.cpp | 3 +++ Source/Core/DolphinWX/ARCodeAddEdit.cpp | 2 ++ .../Core/DolphinWX/Config/AudioConfigPane.cpp | 1 + .../DolphinWX/Config/GameCubeConfigPane.cpp | 1 + Source/Core/DolphinWX/MainNoGUI.cpp | 1 + Source/Core/DolphinWX/MemcardManager.cpp | 2 ++ Source/Core/VideoBackends/D3D/D3DState.cpp | 2 ++ Source/Core/VideoBackends/D3D/D3DTexture.cpp | 2 ++ Source/Core/VideoCommon/ImageWrite.cpp | 2 ++ .../Core/VideoCommon/TextureDecoder_Common.cpp | 2 +- 62 files changed, 107 insertions(+), 32 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp index ee10133ae4b..c9bacac2069 100644 --- a/Source/Core/AudioCommon/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/AOSoundStream.cpp @@ -6,6 +6,8 @@ #include "AudioCommon/AOSoundStream.h" #include "AudioCommon/Mixer.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #if defined(HAVE_AO) && HAVE_AO diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 3a1f460133c..a132cb5de32 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -7,6 +7,7 @@ #include "AudioCommon/AlsaSoundStream.h" #include "Common/CommonTypes.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #define FRAME_COUNT_MIN 256 #define BUFFER_SIZE_MAX 8192 diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index a24c7a196c4..b4f2dae2f0a 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -14,9 +14,9 @@ #include "AudioCommon/PulseAudioStream.h" #include "AudioCommon/XAudio2_7Stream.h" #include "AudioCommon/XAudio2Stream.h" - #include "Common/FileUtil.h" - +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Movie.h" diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp index 3c1d6039af2..f6a26b442fb 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp @@ -5,6 +5,7 @@ #include #include "AudioCommon/CoreAudioSoundStream.h" +#include "Common/Logging/Log.h" OSStatus CoreAudioSound::callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 1bebe885955..56370ed3507 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -18,6 +18,18 @@ #include #endif +CMixer::CMixer(unsigned int BackendSampleRate) + : m_dma_mixer(this, 32000) + , m_streaming_mixer(this, 48000) + , m_wiimote_speaker_mixer(this, 3000) + , m_sampleRate(BackendSampleRate) + , m_log_dtk_audio(false) + , m_log_dsp_audio(false) + , m_speed(0) +{ + INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized"); +} + // Executed from sound stream thread unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit) { diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index dd3b4ab0188..a14acc90cb4 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -19,21 +19,10 @@ #define CONTROL_FACTOR 0.2f // in freq_shift per fifo size offset #define CONTROL_AVG 32 -class CMixer { - +class CMixer +{ public: - CMixer(unsigned int BackendSampleRate) - : m_dma_mixer(this, 32000) - , m_streaming_mixer(this, 48000) - , m_wiimote_speaker_mixer(this, 3000) - , m_sampleRate(BackendSampleRate) - , m_log_dtk_audio(0) - , m_log_dsp_audio(0) - , m_speed(0) - { - INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized"); - } - + CMixer(unsigned int BackendSampleRate); virtual ~CMixer() {} // Called from audio threads diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 139ed7a4807..ce75149f02e 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -8,6 +8,7 @@ #include "AudioCommon/DPL2Decoder.h" #include "AudioCommon/OpenALStream.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #if defined HAVE_OPENAL && HAVE_OPENAL diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp index 2f44ef25f0e..e8b5ff0335b 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.cpp +++ b/Source/Core/AudioCommon/OpenSLESStream.cpp @@ -9,7 +9,9 @@ #include #include "AudioCommon/OpenSLESStream.h" +#include "Common/Assert.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" // engine interfaces static SLObjectItf engineObject; diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp index b897f8beae9..4dc4275e2c8 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/PulseAudioStream.cpp @@ -6,6 +6,7 @@ #include "AudioCommon/PulseAudioStream.h" #include "Common/CommonTypes.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" namespace diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index 510a3a5af00..db7070890f8 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -9,6 +9,7 @@ #include "AudioCommon/Mixer.h" #include "AudioCommon/WaveFile.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" class SoundStream { diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index cdc109058cd..692700a4345 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -6,6 +6,7 @@ #include "AudioCommon/WaveFile.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" enum { BUF_SIZE = 32*1024 }; diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index d5e0595802a..01acb2fc26a 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -6,6 +6,8 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/XAudio2Stream.h" #include "Common/Event.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #ifndef XAUDIO2_DLL #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path. diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index 95414767981..f4a14370d9b 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -10,6 +10,8 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/XAudio2_7Stream.h" #include "Common/Event.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" struct StreamingVoiceContext2_7 : public IXAudio2VoiceCallback { diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp index c775554401d..b0ddc35fbb9 100644 --- a/Source/Core/AudioCommon/aldlist.cpp +++ b/Source/Core/AudioCommon/aldlist.cpp @@ -27,7 +27,8 @@ */ #include "AudioCommon/aldlist.h" -#include "Common/Common.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #ifdef _WIN32 #include "../../../Externals/OpenAL/include/al.h" #include "../../../Externals/OpenAL/include/alc.h" diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index d3babbb11d4..ddbdbf702b3 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -25,6 +25,7 @@ #include #include "Common/Assert.h" +#include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Flag.h" diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 27427d3011d..55bf530143f 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -91,8 +91,3 @@ enum EMUSTATE_CHANGE EMUSTATE_CHANGE_PAUSE, EMUSTATE_CHANGE_STOP }; - -#include "Common/CommonTypes.h" // IWYU pragma: export -#include "Common/CommonFuncs.h" // IWYU pragma: export // NOLINT -#include "Common/MsgHandler.h" // IWYU pragma: export -#include "Common/Logging/Log.h" // IWYU pragma: export diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index cd20316bbe2..5fdac9e0acd 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -12,9 +12,11 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #ifdef _WIN32 #include // for GetSaveFileName diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 4bb8bf63a8e..3deb91dcd15 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/NonCopyable.h" #ifdef _WIN32 diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp index 92f778eb669..a7ee39639bf 100644 --- a/Source/Core/Common/GL/GLInterface/EGL.cpp +++ b/Source/Core/Common/GL/GLInterface/EGL.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/GL/GLInterface/EGL.h" +#include "Common/Logging/Log.h" // Show the current FPS void cInterfaceEGL::Swap() diff --git a/Source/Core/Common/GL/GLInterface/EGLX11.cpp b/Source/Core/Common/GL/GLInterface/EGLX11.cpp index 3859a237068..e2e5d7b51bd 100644 --- a/Source/Core/Common/GL/GLInterface/EGLX11.cpp +++ b/Source/Core/Common/GL/GLInterface/EGLX11.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/GL/GLInterface/EGLX11.h" +#include "Common/Logging/Log.h" EGLDisplay cInterfaceEGLX11::OpenDisplay() { diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp index 56017a89b4d..c6fa90ebd39 100644 --- a/Source/Core/Common/GL/GLInterface/WGL.cpp +++ b/Source/Core/Common/GL/GLInterface/WGL.cpp @@ -5,6 +5,7 @@ #include #include +#include "Common/MsgHandler.h" #include "Common/GL/GLInterface/WGL.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 3847eeb9e58..6c4cf113ac3 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -10,6 +10,7 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp index b891b290904..6d01fbf7068 100644 --- a/Source/Core/Common/Logging/ConsoleListenerNix.cpp +++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp @@ -9,6 +9,7 @@ #endif #include "Common/Logging/ConsoleListener.h" +#include "Common/Logging/Log.h" ConsoleListener::ConsoleListener() { diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h index af2ad40cc04..e48f05e9283 100644 --- a/Source/Core/Common/Logging/LogManager.h +++ b/Source/Core/Common/Logging/LogManager.h @@ -10,8 +10,9 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/NonCopyable.h" +#include "Common/Logging/Log.h" #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 31ed7f9c8f8..1f8fa6a4ec1 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -9,7 +9,9 @@ #include "Common/CommonTypes.h" #include "Common/MemArena.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index 5688c400bab..dc8527eb78e 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -7,7 +7,9 @@ #include #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); static MsgAlertHandler msg_handler = DefaultMsgHandler; diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 6037137410b..d4c9f8a1515 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -7,11 +7,13 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" namespace Common { diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index fe49202a595..84083ece2fe 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -39,9 +39,11 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/SDCardUtil.h" +#include "Common/Logging/Log.h" #ifndef _WIN32 #include // for unlink() diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index ac6c24bdfbe..9fdbd9f8019 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -14,9 +14,11 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index ac4cbc7369f..2516561a5aa 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -11,7 +11,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" std::string StringFromFormatV(const char* format, va_list args); diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp index 047114774a8..7fe267cadfe 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Common/SysConf.cpp @@ -8,10 +8,12 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/SysConf.h" +#include "Common/Logging/Log.h" SysConf::SysConf() : m_IsValid(false) diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h index 92346363182..639a8b0eda1 100644 --- a/Source/Core/Common/SysConf.h +++ b/Source/Core/Common/SysConf.h @@ -10,7 +10,9 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" // This class is meant to edit the values in a given Wii SYSCONF file // It currently does not add/remove/rearrange sections, diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index f17ce0d9212..002c8834aa1 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -1,7 +1,9 @@ // This file is public domain, in case it's useful to anyone. -comex +#include "Common/MsgHandler.h" #include "Common/Timer.h" #include "Common/TraversalClient.h" +#include "Common/Logging/Log.h" static void GetRandomishBytes(u8* buf, size_t size) { diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index 03211444c1b..8ab2478b4bd 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -5,8 +5,9 @@ #include #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "Core/HLE/HLE_OS.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp index a990e985bc0..2dad7169adc 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp @@ -5,6 +5,7 @@ #include #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceEthernet.h" diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp index 7cb546a7dea..66571f0f8d5 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp @@ -7,6 +7,7 @@ #endif #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceEthernet.h" diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp index ce9a18825ea..c7caa207068 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp @@ -2,8 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceEthernet.h" #include "Core/HW/BBA-TAP/TAP_Win32.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp index c12e4f6ddf7..51b808a3797 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #if HAVE_PORTAUDIO diff --git a/Source/Core/Core/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp index f9526725d56..de273b9fa59 100644 --- a/Source/Core/Core/HW/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard.cpp @@ -8,6 +8,8 @@ #include "Common/ColorUtil.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "Core/HW/GCMemcard.h" static void ByteSwap(u8 *valueA, u8 *valueB) diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index d3077d34ccb..d690a3c4f07 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -7,6 +7,7 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/NandPaths.h" diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI_Device.cpp index 842ec23bf45..f125173c975 100644 --- a/Source/Core/Core/HW/SI_Device.cpp +++ b/Source/Core/Core/HW/SI_Device.cpp @@ -5,6 +5,7 @@ #include #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceAMBaseboard.h" #include "Core/HW/SI_DeviceDanceMat.h" diff --git a/Source/Core/Core/HW/WiiSaveCrypted.cpp b/Source/Core/Core/HW/WiiSaveCrypted.cpp index 59748fdc521..ab2b31b800d 100644 --- a/Source/Core/Core/HW/WiiSaveCrypted.cpp +++ b/Source/Core/Core/HW/WiiSaveCrypted.cpp @@ -18,12 +18,15 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" +#include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" #include "Common/Crypto/ec.h" +#include "Common/Logging/Log.h" #include "Core/HW/WiiSaveCrypted.h" diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 9a63991550f..931c9c811ba 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -11,6 +11,7 @@ #include #include +#include "Common/Common.h" #include "Common/FifoQueue.h" #include "Common/NonCopyable.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/ec_wii.cpp b/Source/Core/Core/ec_wii.cpp index 08349c8e2b7..06d30151c75 100644 --- a/Source/Core/Core/ec_wii.cpp +++ b/Source/Core/Core/ec_wii.cpp @@ -14,7 +14,7 @@ #include "Common/FileUtil.h" #include "Common/Crypto/ec.h" - +#include "Common/Logging/Log.h" #include "Core/ec_wii.h" static u32 default_NG_id = 0x0403AC68; diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 04304b76138..074460f1697 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -19,7 +19,9 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Hash.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/CompressedBlob.h" #include "DiscIO/DiscScrubber.h" diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 10d0c0e4175..e669a5f4b3a 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -12,6 +12,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/DiscScrubber.h" #include "DiscIO/Filesystem.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index 3f0b073945c..07105a9170f 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -8,6 +8,8 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/DriveBlob.h" diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index cd6f8156295..439a80af99a 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -11,8 +11,9 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "DiscIO/Filesystem.h" #include "DiscIO/FileSystemGCWii.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index c59bc8079e5..733f0735d8d 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -15,6 +15,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" +#include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 22df4a3beef..4b3e90e2d0b 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -13,7 +13,7 @@ #include "Common/CommonTypes.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index e0d17f17ee1..ce7eb69f785 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -11,6 +11,7 @@ #include "Common/ColorUtil.h" #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Common/Logging/Log.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index a268b3add9c..6df6ceb423c 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -11,7 +11,9 @@ #include "Common/CommonTypes.h" #include "Common/MathUtil.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeWad.h" diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 5c0ac028ea1..9607f15f3c6 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -8,8 +8,11 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "DiscIO/WbfsBlob.h" namespace DiscIO diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index c34393d3d60..b1ad736a38b 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -16,7 +16,9 @@ #include #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/ActionReplay.h" #include "Core/ARDecrypt.h" #include "DolphinWX/ARCodeAddEdit.h" diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.cpp b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp index ddce63b8f39..cc4d6468039 100644 --- a/Source/Core/DolphinWX/Config/AudioConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp @@ -14,6 +14,7 @@ #include #include "AudioCommon/AudioCommon.h" +#include "Common/Common.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp index f4426ef3a97..721a1eecc34 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp @@ -13,6 +13,7 @@ #include #include +#include "Common/Common.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 5b46e207e5e..70f099deb74 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -11,6 +11,7 @@ #include "Common/CommonTypes.h" #include "Common/Event.h" +#include "Common/MsgHandler.h" #include "Common/Logging/LogManager.h" #include "Core/BootManager.h" diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index a58a5c0c4a7..009f055699d 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/Source/Core/DolphinWX/MemcardManager.cpp @@ -24,7 +24,9 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/HW/GCMemcard.h" #include "DolphinWX/MemcardManager.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp index 9627ae2019b..c5c70dd19ac 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.cpp +++ b/Source/Core/VideoBackends/D3D/D3DState.cpp @@ -3,6 +3,8 @@ // Refer to the license.txt file included. #include "Common/BitSet.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/Logging/Log.h" #include "VideoBackends/D3D/D3DBase.h" diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp index 49c0d0916de..77293a52d01 100644 --- a/Source/Core/VideoBackends/D3D/D3DTexture.cpp +++ b/Source/Core/VideoBackends/D3D/D3DTexture.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DTexture.h" diff --git a/Source/Core/VideoCommon/ImageWrite.cpp b/Source/Core/VideoCommon/ImageWrite.cpp index 38ca509c3e8..f50c5d02b4f 100644 --- a/Source/Core/VideoCommon/ImageWrite.cpp +++ b/Source/Core/VideoCommon/ImageWrite.cpp @@ -8,6 +8,8 @@ #include "png.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "VideoCommon/ImageWrite.h" bool SaveData(const std::string& filename, const char* data) diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index a1c7bff0c29..5f8f314a0b7 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -7,8 +7,8 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/Logging/Log.h" - #include "VideoCommon/LookUpTables.h" #include "VideoCommon/sfont.inc" #include "VideoCommon/TextureDecoder.h"