From 46057db37d086c47ff6c69f200f66648fa0e6c84 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Thu, 18 Sep 2014 23:17:41 -0500 Subject: [PATCH] Fix build failing when disabling precompiled headers. --- Source/Core/AudioCommon/AOSoundStream.h | 1 + Source/Core/AudioCommon/aldlist.cpp | 2 +- Source/Core/Common/ColorUtil.cpp | 2 +- Source/Core/Common/Crypto/ec.cpp | 2 +- Source/Core/Common/Hash.cpp | 1 + Source/Core/Common/MathUtil.cpp | 1 + Source/Core/Common/MemoryUtil.cpp | 3 +++ Source/Core/Common/Misc.cpp | 2 ++ Source/Core/Common/SymbolDB.cpp | 1 + Source/Core/Common/Thread.cpp | 1 + Source/Core/Core/ArmMemTools.cpp | 1 + Source/Core/Core/Boot/ElfReader.cpp | 2 +- Source/Core/Core/Debugger/Debugger_SymbolMap.h | 1 + Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp | 1 + Source/Core/Core/HW/GPFifo.h | 2 +- Source/Core/Core/HW/SI_DeviceGBA.cpp | 2 ++ Source/Core/Core/HW/WiimoteEmu/Encryption.cpp | 1 + Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp | 4 +++- Source/Core/Core/PowerPC/PPCCache.cpp | 1 + Source/Core/Core/VolumeHandler.cpp | 1 + Source/Core/Core/x64MemTools.cpp | 1 + Source/Core/DiscIO/BannerLoaderGC.cpp | 3 ++- Source/Core/DiscIO/VolumeCommon.cpp | 1 + Source/Core/DiscIO/VolumeWiiCrypted.cpp | 2 ++ .../Core/InputCommon/ControllerInterface/Android/Android.cpp | 1 + Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 1 + Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp | 1 + Source/Core/VideoBackends/OGL/FramebufferManager.cpp | 1 + Source/Core/VideoBackends/Software/CPMemLoader.cpp | 1 + Source/Core/VideoBackends/Software/EfbInterface.cpp | 1 + Source/Core/VideoBackends/Software/SWStatistics.cpp | 1 + Source/Core/VideoBackends/Software/SWVideoConfig.h | 2 +- Source/Core/VideoBackends/Software/TextureSampler.cpp | 1 + Source/Core/VideoBackends/Software/XFMemLoader.cpp | 1 + Source/Core/VideoCommon/TextureDecoder_Common.cpp | 4 ++++ Source/Core/VideoCommon/TextureDecoder_Generic.cpp | 2 +- Source/Core/VideoCommon/TextureDecoder_x64.cpp | 2 +- Source/Core/VideoCommon/VertexLoaderManager.cpp | 1 + Source/Core/VideoCommon/XFStructs.cpp | 2 +- 39 files changed, 50 insertions(+), 11 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index fe9747599e..23799f7627 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -9,6 +9,7 @@ #include "AudioCommon/SoundStream.h" #include "Common/Event.h" +#include "Common/Thread.h" #if defined(HAVE_AO) && HAVE_AO #include diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp index 559d3b9164..0b75f8f5cd 100644 --- a/Source/Core/AudioCommon/aldlist.cpp +++ b/Source/Core/AudioCommon/aldlist.cpp @@ -23,7 +23,7 @@ */ #include "AudioCommon/aldlist.h" -#include "Common/CommonTypes.h" +#include "Common/Common.h" #ifdef _WIN32 #include "../../../Externals/OpenAL/include/al.h" #include "../../../Externals/OpenAL/include/alc.h" diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index f3cf24aa4b..04ac293a7d 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ColorUtil.h" -#include "Common/CommonTypes.h" +#include "Common/CommonFuncs.h" namespace ColorUtil { diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index 09f116586f..b75411b0d6 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -11,7 +11,7 @@ #include #include -#include "Common/CommonTypes.h" +#include "Common/Common.h" #include "Common/Crypto/bn.h" #include "Common/Crypto/ec.h" diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index e346dba796..efe782caf5 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include "Common/CommonFuncs.h" #include "Common/Hash.h" #if _M_SSE >= 0x402 #include "Common/CPUDetect.h" diff --git a/Source/Core/Common/MathUtil.cpp b/Source/Core/Common/MathUtil.cpp index fb48e15df6..e409e3fe24 100644 --- a/Source/Core/Common/MathUtil.cpp +++ b/Source/Core/Common/MathUtil.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index a741deef4f..fd88726814 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -6,8 +6,11 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/Misc.cpp b/Source/Core/Common/Misc.cpp index 05293aa358..3a8454a36e 100644 --- a/Source/Core/Common/Misc.cpp +++ b/Source/Core/Common/Misc.cpp @@ -6,6 +6,8 @@ #include #include +#include "Common/CommonFuncs.h" + // Neither Android nor OS X support TLS #if defined(__APPLE__) || (ANDROID && __clang__) #define __thread diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index 08fdbdc857..916f5415d4 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -9,6 +9,7 @@ #include "Common/CommonTypes.h" #include "Common/SymbolDB.h" +#include "Common/Logging/Log.h" void SymbolDB::List() { diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index 9e27387c9a..286ed088bc 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/Thread.h" diff --git a/Source/Core/Core/ArmMemTools.cpp b/Source/Core/Core/ArmMemTools.cpp index 8b166580a8..634c2a7bf8 100644 --- a/Source/Core/Core/ArmMemTools.cpp +++ b/Source/Core/Core/ArmMemTools.cpp @@ -12,6 +12,7 @@ #include // Look in here for the context definition. #endif +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Core/MemTools.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp index eba28e8014..d29b34a3d8 100644 --- a/Source/Core/Core/Boot/ElfReader.cpp +++ b/Source/Core/Core/Boot/ElfReader.cpp @@ -4,7 +4,7 @@ #include -#include "Common/CommonTypes.h" +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Core/Boot/ElfReader.h" diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index ebfafd6f5a..2c7d43ad6e 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -8,6 +8,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" namespace Dolphin_Debugger { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp index b698eece2f..5e4f670cba 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp @@ -4,6 +4,7 @@ #include +#include "Common/CommonFuncs.h" #include "Common/MathUtil.h" #include "Core/HW/DSP.h" diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 608c079c50..d4a6974952 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/CommonTypes.h" +#include "Common/Common.h" class PointerWrap; namespace GPFifo diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp index 57058359bb..3526a210e6 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp @@ -4,7 +4,9 @@ #include +#include "Common/CommonFuncs.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceGBA.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp index d1b3fe8a85..8b3718e937 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp @@ -4,6 +4,7 @@ // // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com) +#include #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Encryption.h" diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp index ae59cf669e..daebe00304 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp @@ -4,7 +4,9 @@ #include -#include "Common/CommonTypes.h" +#include "Common/Common.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "Core/IPC_HLE/WiiMote_HID_Attr.h" #if 0 diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 26388bc575..93693dd7b3 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/VolumeHandler.cpp b/Source/Core/Core/VolumeHandler.cpp index e0b58cd8ae..1c522756f5 100644 --- a/Source/Core/Core/VolumeHandler.cpp +++ b/Source/Core/Core/VolumeHandler.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Core/VolumeHandler.h" #include "DiscIO/VolumeCreator.h" diff --git a/Source/Core/Core/x64MemTools.cpp b/Source/Core/Core/x64MemTools.cpp index 518c3bb160..17e023731b 100644 --- a/Source/Core/Core/x64MemTools.cpp +++ b/Source/Core/Core/x64MemTools.cpp @@ -9,6 +9,7 @@ #include "Common/Thread.h" #endif +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/x64Analyzer.h" diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp index 43cd7c6e24..ce265a016e 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/BannerLoaderGC.cpp @@ -8,7 +8,8 @@ #include "Common/ColorUtil.h" #include "Common/CommonTypes.h" - +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "DiscIO/BannerLoaderGC.h" #include "DiscIO/Filesystem.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index cc2f468b7e..efcd9c5f53 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -6,6 +6,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "DiscIO/Volume.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index dd4c2ea6cd..32313dd4c2 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -9,7 +9,9 @@ #include #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeGC.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 0f6a6ed0a5..e29cfb0ce7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include "InputCommon/ControllerInterface/Android/Android.h" namespace ciface diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 9fb9e96f6e..efb2301956 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include #include "InputCommon/ControllerInterface/Xlib/XInput2.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index 18f1141c6d..973368a78e 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -1,3 +1,4 @@ +#include #include #include "InputCommon/ControllerInterface/Xlib/Xlib.h" diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index 62f112af2e..e64b4f3ad8 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "VideoBackends/OGL/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.cpp b/Source/Core/VideoBackends/Software/CPMemLoader.cpp index cb57ea5ccf..8e78059616 100644 --- a/Source/Core/VideoBackends/Software/CPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/CPMemLoader.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/CPMemLoader.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index 3a5a48e160..2d8cd83ee1 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -4,6 +4,7 @@ #include +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/VideoBackends/Software/SWStatistics.cpp b/Source/Core/VideoBackends/Software/SWStatistics.cpp index e1d3ec8c0b..fcfd5be6d9 100644 --- a/Source/Core/VideoBackends/Software/SWStatistics.cpp +++ b/Source/Core/VideoBackends/Software/SWStatistics.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include "VideoBackends/Software/SWStatistics.h" SWStatistics swstats; diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h index 812b9c2018..758f9bb722 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.h +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/CommonTypes.h" +#include "Common/Common.h" #define STATISTICS 1 diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index cc90f11ae2..5ac756cc5a 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -5,6 +5,7 @@ #include #include +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/TextureSampler.h" diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/XFMemLoader.cpp index bdf8967667..08e03ad8d8 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/XFMemLoader.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/Clipper.h" #include "VideoBackends/Software/CPMemLoader.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index eb9089a33f..71e801afe7 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -2,6 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + +#include "Common/Common.h" + #include "VideoCommon/LookUpTables.h" #include "VideoCommon/sfont.inc" #include "VideoCommon/TextureDecoder.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index 7ccc88d1e3..663e73f756 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/CommonTypes.h" +#include "Common/Common.h" #include "Common/CPUDetect.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/TextureDecoder.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 7446ae6c46..1800c8bb04 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/CommonTypes.h" +#include "Common/Common.h" //#include "VideoCommon.h" // to get debug logs #include "Common/CPUDetect.h" diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 873590b1c2..dbf22c9c3d 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -8,6 +8,7 @@ #include #include +#include "Common/CommonFuncs.h" #include "Core/HW/Memmap.h" #include "VideoCommon/BPMemory.h" diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 0d2ae6e19c..650a4a913b 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/CommonTypes.h" +#include "Common/Common.h" #include "Core/HW/Memmap.h" #include "VideoCommon/CPMemory.h" #include "VideoCommon/DataReader.h"