diff --git a/CMakeLists.txt b/CMakeLists.txt index c96f87ceb4..10ba7c7560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -472,16 +472,7 @@ endif() ######################################## # Setup include directories (and make sure they are preferred over the Externals) # -include_directories(Source/Core/AudioCommon) -include_directories(Source/Core/Common) -include_directories(Source/Core/Core) -include_directories(Source/Core/DebuggerUICommon) -include_directories(Source/Core/DebuggerWX) -include_directories(Source/Core/DiscIO) -include_directories(Source/Core/DolphinWX) -include_directories(Source/Core/InputCommon) -include_directories(Source/Core/VideoCommon) -include_directories(Source/Core/VideoUICommon) +include_directories(Source/Core) ######################################## # Process externals and setup their include directories diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp index 5a657a5fd8..4925d3aa52 100644 --- a/Source/Core/AudioCommon/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/AOSoundStream.cpp @@ -5,8 +5,8 @@ #include #include -#include "AOSoundStream.h" -#include "Mixer.h" +#include "AudioCommon/AOSoundStream.h" +#include "AudioCommon/Mixer.h" #if defined(HAVE_AO) && HAVE_AO diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index 530108479c..d2097cadb0 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -4,8 +4,8 @@ #pragma once -#include "SoundStream.h" -#include "Thread.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" #if defined(HAVE_AO) && HAVE_AO #include diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 4c84ae69e1..a88fae0b65 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -4,9 +4,9 @@ #include -#include "Common.h" -#include "Thread.h" -#include "AlsaSoundStream.h" +#include "AudioCommon/AlsaSoundStream.h" +#include "Common/Common.h" +#include "Common/Thread.h" #define FRAME_COUNT_MIN 256 #define BUFFER_SIZE_MAX 8192 diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index defa3c408a..78a8576d5e 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -8,10 +8,9 @@ #include #endif -#include "Common.h" -#include "SoundStream.h" - -#include "Thread.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Common.h" +#include "Common/Thread.h" class AlsaSound : public SoundStream { diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 7bb1e093f9..a8229b3f84 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -2,21 +2,24 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "AudioCommon.h" -#include "FileUtil.h" -#include "Mixer.h" -#include "NullSoundStream.h" -#include "DSoundStream.h" -#include "XAudio2_7Stream.h" -#include "XAudio2Stream.h" -#include "AOSoundStream.h" -#include "AlsaSoundStream.h" -#include "CoreAudioSoundStream.h" -#include "OpenALStream.h" -#include "PulseAudioStream.h" -#include "OpenSLESStream.h" -#include "../Core/Movie.h" -#include "../Core/ConfigManager.h" + +#include "AudioCommon/AlsaSoundStream.h" +#include "AudioCommon/AOSoundStream.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/CoreAudioSoundStream.h" +#include "AudioCommon/DSoundStream.h" +#include "AudioCommon/Mixer.h" +#include "AudioCommon/NullSoundStream.h" +#include "AudioCommon/OpenALStream.h" +#include "AudioCommon/OpenSLESStream.h" +#include "AudioCommon/PulseAudioStream.h" +#include "AudioCommon/XAudio2_7Stream.h" +#include "AudioCommon/XAudio2Stream.h" + +#include "Common/FileUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/Movie.h" // This shouldn't be a global, at least not here. SoundStream *soundStream = nullptr; diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h index f1aece0b9c..054c0fe47e 100644 --- a/Source/Core/AudioCommon/AudioCommon.h +++ b/Source/Core/AudioCommon/AudioCommon.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "SoundStream.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Common.h" class CMixer; diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp index 967eaa4b0a..a46edbb660 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp @@ -4,7 +4,7 @@ #include -#include "CoreAudioSoundStream.h" +#include "AudioCommon/CoreAudioSoundStream.h" OSStatus CoreAudioSound::callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h index 5ebbbb945c..4df7c6000e 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h @@ -8,7 +8,7 @@ #include #endif -#include "SoundStream.h" +#include "AudioCommon/SoundStream.h" class CoreAudioSound : public SoundStream { diff --git a/Source/Core/AudioCommon/DPL2Decoder.cpp b/Source/Core/AudioCommon/DPL2Decoder.cpp index 399541c1c9..418239fae4 100644 --- a/Source/Core/AudioCommon/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/DPL2Decoder.cpp @@ -7,13 +7,14 @@ // * Copyright (c) 2004-2006 Milan Cutka // * based on mplayer HRTF plugin by ylai +#include +#include #include -#include -#include -#include #include -#include "DPL2Decoder.h" -#include "MathUtil.h" +#include + +#include "AudioCommon/DPL2Decoder.h" +#include "Common/MathUtil.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp index c5d2e3afb8..76eb404665 100644 --- a/Source/Core/AudioCommon/DSoundStream.cpp +++ b/Source/Core/AudioCommon/DSoundStream.cpp @@ -7,8 +7,8 @@ #include -#include "AudioCommon.h" -#include "DSoundStream.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/DSoundStream.h" bool DSound::CreateBuffer() { diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h index def27babb5..b79cb0d1eb 100644 --- a/Source/Core/AudioCommon/DSoundStream.h +++ b/Source/Core/AudioCommon/DSoundStream.h @@ -4,8 +4,8 @@ #pragma once -#include "SoundStream.h" -#include "Thread.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" #ifdef _WIN32 #include diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 966b355dc0..15a7b4d7f1 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -2,18 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Atomic.h" -#include "Mixer.h" -#include "AudioCommon.h" -#include "CPUDetect.h" -#include "../Core/Host.h" -#include "ConfigManager.h" -#include "HW/VideoInterface.h" - -#include "../Core/HW/AudioInterface.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/Mixer.h" +#include "Common/Atomic.h" +#include "Common/CPUDetect.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/VideoInterface.h" // UGLINESS -#include "../Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PowerPC.h" #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) #include diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index ca9c5b7dd5..2fb2d2961c 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -4,8 +4,8 @@ #pragma once -#include "WaveFile.h" -#include "StdMutex.h" +#include "AudioCommon/WaveFile.h" +#include "Common/StdMutex.h" // 16 bit Stereo #define MAX_SAMPLES (1024 * 2) // 64ms diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp index 99bf8aae4b..fcd577f97a 100644 --- a/Source/Core/AudioCommon/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/NullSoundStream.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NullSoundStream.h" -#include "../Core/HW/SystemTimers.h" -#include "../Core/HW/AudioInterface.h" +#include "AudioCommon/NullSoundStream.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/SystemTimers.h" void NullSound::SoundLoop() { diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index bcc96a9151..4b971c97d3 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -4,8 +4,8 @@ #pragma once -#include -#include "SoundStream.h" +#include +#include "AudioCommon/SoundStream.h" #define BUF_SIZE (48000 * 4 / 32) diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 6e741e8e71..46f7cc3407 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "aldlist.h" -#include "OpenALStream.h" -#include "DPL2Decoder.h" +#include "AudioCommon/aldlist.h" +#include "AudioCommon/DPL2Decoder.h" +#include "AudioCommon/OpenALStream.h" #if defined HAVE_OPENAL && HAVE_OPENAL diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 6653e33684..1317a61f7a 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -4,8 +4,11 @@ #pragma once -#include "SoundStream.h" -#include "Thread.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" +#include "Core/Core.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/SystemTimers.h" #if defined HAVE_OPENAL && HAVE_OPENAL #ifdef _WIN32 @@ -21,9 +24,6 @@ #include #endif -#include "Core.h" -#include "HW/SystemTimers.h" -#include "HW/AudioInterface.h" #include #include diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp index ad6b3edece..847fcdffaa 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.cpp +++ b/Source/Core/AudioCommon/OpenSLESStream.cpp @@ -3,13 +3,14 @@ // Refer to the license.txt file included. #ifdef ANDROID -#include "Common.h" #include -#include "OpenSLESStream.h" #include #include +#include "AudioCommon/OpenSLESStream.h" +#include "Common/Common.h" + // engine interfaces static SLObjectItf engineObject; static SLEngineItf engineEngine; diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index a75aab59f9..dcc94cd43b 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -4,8 +4,8 @@ #pragma once -#include "Thread.h" -#include "SoundStream.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" class OpenSLESStream : public SoundStream { diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp index fe68d0eb6c..647798c39f 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/PulseAudioStream.cpp @@ -4,10 +4,9 @@ #include -#include "Common.h" -#include "Thread.h" - -#include "PulseAudioStream.h" +#include "AudioCommon/PulseAudioStream.h" +#include "Common/Common.h" +#include "Common/Thread.h" namespace { diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index c9ccfb80fa..732772ace2 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -10,10 +10,9 @@ #include -#include "Common.h" -#include "SoundStream.h" - -#include "Thread.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Common.h" +#include "Common/Thread.h" class PulseAudio : public SoundStream { diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index dd130e814a..0e4736de4f 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -4,9 +4,9 @@ #pragma once -#include "Common.h" -#include "Mixer.h" -#include "WaveFile.h" +#include "AudioCommon/Mixer.h" +#include "AudioCommon/WaveFile.h" +#include "Common/Common.h" class SoundStream { diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index f73b484fe7..776d0d6fa4 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "WaveFile.h" -#include "../Core/ConfigManager.h" +#include "AudioCommon/WaveFile.h" +#include "Common/Common.h" +#include "Core/ConfigManager.h" enum {BUF_SIZE = 32*1024}; diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index e96f64ab5d..baa7b0434f 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -14,7 +14,7 @@ #pragma once -#include "FileUtil.h" +#include "Common/FileUtil.h" class WaveFileWriter { diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index 4e9bade618..117484ca80 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include -#include "AudioCommon.h" -#include "XAudio2Stream.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/XAudio2Stream.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/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h index d85aafc4f7..de38c8765a 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.h +++ b/Source/Core/AudioCommon/XAudio2Stream.h @@ -9,8 +9,9 @@ #pragma once #include -#include "Thread.h" -#include "SoundStream.h" + +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" #ifdef _WIN32 diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index d03953fc57..3a98dc0e0a 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -7,8 +7,8 @@ // instead of other possible places. This may be accomplished by adding the path to // the AdditionalIncludeDirectories for this file via msbuild. -#include "AudioCommon.h" -#include "XAudio2_7Stream.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/XAudio2_7Stream.h" #ifdef HAVE_DXSDK #include diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h index bbea6dd2db..ce0806a5c9 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.h +++ b/Source/Core/AudioCommon/XAudio2_7Stream.h @@ -13,8 +13,8 @@ #pragma once #include -#include "Thread.h" -#include "SoundStream.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" #ifdef _WIN32 diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp index 0cb33a8ad2..644e728bfe 100644 --- a/Source/Core/AudioCommon/aldlist.cpp +++ b/Source/Core/AudioCommon/aldlist.cpp @@ -22,8 +22,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "Common.h" -#include "aldlist.h" +#include "AudioCommon/aldlist.h" +#include "Common/Common.h" #ifdef _WIN32 #include "../../../Externals/OpenAL/include/al.h" #include "../../../Externals/OpenAL/include/alc.h" diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h index 7ea071d12e..fabe435233 100644 --- a/Source/Core/AudioCommon/aldlist.h +++ b/Source/Core/AudioCommon/aldlist.h @@ -1,12 +1,14 @@ #pragma once -#include "CommonTypes.h" +#include +#include + +#include "Common/CommonTypes.h" + #ifdef _WIN32 #pragma warning(disable: 4786) //disable warning "identifier was truncated to //'255' characters in the browser information" #endif -#include -#include using namespace std; diff --git a/Source/Core/AudioCommon/stdafx.cpp b/Source/Core/AudioCommon/stdafx.cpp index b602b39925..0ec820a662 100644 --- a/Source/Core/AudioCommon/stdafx.cpp +++ b/Source/Core/AudioCommon/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "AudioCommon/stdafx.h" diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp index 0c9a8c6e64..65353ba339 100644 --- a/Source/Core/Common/ArmCPUDetect.cpp +++ b/Source/Core/Common/ArmCPUDetect.cpp @@ -1,23 +1,10 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" -#include "CPUDetect.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/FileUtil.h" // Only Linux platforms have /proc/cpuinfo #if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__) diff --git a/Source/Core/Common/ArmEmitter.cpp b/Source/Core/Common/ArmEmitter.cpp index 7bcd6e8f68..d35f7f6afa 100644 --- a/Source/Core/Common/ArmEmitter.cpp +++ b/Source/Core/Common/ArmEmitter.cpp @@ -1,27 +1,14 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" -#include "ArmEmitter.h" -#include "CPUDetect.h" +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include #include +#include "Common/ArmEmitter.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" + // For cache flushing on Symbian/iOS/Blackberry #ifdef __SYMBIAN32__ #include diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index 836a1072b8..837a931e4c 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -1,4 +1,4 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. @@ -6,12 +6,14 @@ #pragma once -#include "Common.h" -#include "MemoryUtil.h" +#include + +#include "Common/Common.h" +#include "Common/MemoryUtil.h" + #if defined(__SYMBIAN32__) || defined(PANDORA) #include #endif -#include #undef _IP #undef R0 diff --git a/Source/Core/Common/Atomic.h b/Source/Core/Common/Atomic.h index 7d2f9204e8..88e38ed20e 100644 --- a/Source/Core/Common/Atomic.h +++ b/Source/Core/Common/Atomic.h @@ -6,11 +6,11 @@ #ifdef _WIN32 -#include "Atomic_Win32.h" +#include "Common/Atomic_Win32.h" #else // GCC-compatible compiler assumed! -#include "Atomic_GCC.h" +#include "Common/Atomic_GCC.h" #endif diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h index e250efbdca..b6aef1a94c 100644 --- a/Source/Core/Common/Atomic_GCC.h +++ b/Source/Core/Common/Atomic_GCC.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // Atomic operations are performed in a single step by the CPU. It is // impossible for other threads to see the operation "half-done." diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h index 5e52b0a0eb..2615d94c34 100644 --- a/Source/Core/Common/Atomic_Win32.h +++ b/Source/Core/Common/Atomic_Win32.h @@ -4,10 +4,11 @@ #pragma once -#include "Common.h" #include #include +#include "Common/Common.h" + // Atomic operations are performed in a single step by the CPU. It is // impossible for other threads to see the operation "half-done." // diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp index 912afd7fee..326f4df661 100644 --- a/Source/Core/Common/BreakPoints.cpp +++ b/Source/Core/Common/BreakPoints.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "DebugInterface.h" -#include "BreakPoints.h" -#include "../Core/PowerPC/JitCommon/JitBase.h" - #include +#include "Common/BreakPoints.h" +#include "Common/Common.h" +#include "Common/DebugInterface.h" +#include "Core/PowerPC/JitCommon/JitBase.h" + bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { for (const TBreakPoint& bp : m_BreakPoints) diff --git a/Source/Core/Common/BreakPoints.h b/Source/Core/Common/BreakPoints.h index 285e5cd968..cecad0c62a 100644 --- a/Source/Core/Common/BreakPoints.h +++ b/Source/Core/Common/BreakPoints.h @@ -4,10 +4,10 @@ #pragma once -#include #include +#include -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class DebugInterface; diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp index 37b5f281c5..156b758749 100644 --- a/Source/Core/Common/CDUtils.cpp +++ b/Source/Core/Common/CDUtils.cpp @@ -1,13 +1,13 @@ // Most of the code in this file was shamelessly ripped from libcdio With minor adjustments -#include "CDUtils.h" -#include "Common.h" -#include "StringUtil.h" - #include // for std::unique_ptr + +#include "Common/CDUtils.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" + #ifdef _WIN32 #include -#include "StringUtil.h" #elif __APPLE__ #include #include diff --git a/Source/Core/Common/CDUtils.h b/Source/Core/Common/CDUtils.h index 19ca22df1a..576922ea76 100644 --- a/Source/Core/Common/CDUtils.h +++ b/Source/Core/Common/CDUtils.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include // Returns a pointer to an array of strings with the device names std::vector cdio_get_devices(); diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index 10ec036cad..fe33d6cbaf 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -13,16 +13,16 @@ // - Zero backwards/forwards compatibility // - Serialization code for anything complex has to be manually written. +#include +#include #include #include -#include -#include -#include #include #include +#include -#include "Common.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" // ewww #if _LIBCPP_VERSION diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index b23da3a05b..0930668fe4 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ColorUtil.h" +#include "Common/ColorUtil.h" +#include "Common/Common.h" namespace ColorUtil { diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h index bf4979e7ba..042e55ddb8 100644 --- a/Source/Core/Common/ColorUtil.h +++ b/Source/Core/Common/ColorUtil.h @@ -4,6 +4,8 @@ #pragma once +#include "Common/CommonTypes.h" + namespace ColorUtil { diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index fc326e2cc8..b5d78bafd7 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -7,9 +7,9 @@ // DO NOT EVER INCLUDE directly _or indirectly_ from this file // since it slows down the build a lot. -#include -#include -#include +#include +#include +#include // SVN version number extern const char *scm_desc_str; @@ -45,10 +45,6 @@ private: }; #endif -#include "Log.h" -#include "CommonTypes.h" -#include "MsgHandler.h" - #ifdef __APPLE__ // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes. @@ -172,4 +168,7 @@ enum EMUSTATE_CHANGE EMUSTATE_CHANGE_STOP }; -#include "CommonFuncs.h" +#include "Common/CommonTypes.h" +#include "Common/CommonFuncs.h" // NOLINT: needs to be included after CommonTypes +#include "Common/Log.h" +#include "Common/MsgHandler.h" diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 611e1a1641..ab683221b3 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -11,9 +11,10 @@ #define SLEEP(x) usleep(x*1000) #endif +#include #include #include -#include "Common.h" +#include "Common/CommonTypes.h" // Will fail to compile on a non-array: // TODO: make this a function when constexpr is available diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 633afbd755..dc05b92d56 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -5,7 +5,7 @@ #pragma once // Make sure we pick up USER_DIR if set in config.h -#include "Common.h" +#include "Common/Common.h" // Directory seperators, do we need this? #define DIR_SEP "/" diff --git a/Source/Core/Common/CommonTypes.h b/Source/Core/Common/CommonTypes.h index 56210da18f..6ec7045c42 100644 --- a/Source/Core/Common/CommonTypes.h +++ b/Source/Core/Common/CommonTypes.h @@ -9,8 +9,8 @@ #pragma once -#include #include +#include #ifdef _WIN32 diff --git a/Source/Core/Common/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp index a0676df731..e2a9dd6a4a 100644 --- a/Source/Core/Common/Crypto/bn.cpp +++ b/Source/Core/Common/Crypto/bn.cpp @@ -2,10 +2,11 @@ // Licensed under the terms of the GNU GPL, version 2 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +#include #include -#include -#include "../Common.h" -#include "tools.h" + +#include "Common/Common.h" +#include "Common/Crypto/tools.h" /*static void bn_print(char *name, u8 *a, u32 n) { diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index e1eb617406..727f5d828c 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -6,13 +6,13 @@ // Licensed under the terms of the GNU GPL, version 2 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +#include +#include +#include #include -#include -#include -#include -#include "../Common.h" -#include "tools.h" +#include "Common/Common.h" +#include "Common/Crypto/tools.h" // y**2 + x*y = x**3 + x + b /* static u8 ec_b[30] = diff --git a/Source/Core/Common/ExtendedTrace.cpp b/Source/Core/Common/ExtendedTrace.cpp index 379b2c4f03..527b8609ab 100644 --- a/Source/Core/Common/ExtendedTrace.cpp +++ b/Source/Core/Common/ExtendedTrace.cpp @@ -14,10 +14,11 @@ #if defined(WIN32) +#include #include -#include -#include "ExtendedTrace.h" -#include "StringUtil.h" + +#include "Common/ExtendedTrace.h" +#include "Common/StringUtil.h" using namespace std; #include diff --git a/Source/Core/Common/FPURoundMode.h b/Source/Core/Common/FPURoundMode.h index 759aaac37c..e7b4884cb0 100644 --- a/Source/Core/Common/FPURoundMode.h +++ b/Source/Core/Common/FPURoundMode.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" namespace FPURoundMode { diff --git a/Source/Core/Common/FifoQueue.h b/Source/Core/Common/FifoQueue.h index 9cae0f5f1d..b6e237ada8 100644 --- a/Source/Core/Common/FifoQueue.h +++ b/Source/Core/Common/FifoQueue.h @@ -3,7 +3,7 @@ // a simple lockless thread-safe, // single reader, single writer queue -#include "Atomic.h" +#include "Common/Atomic.h" namespace Common { diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 7597b91496..4cecb2bf83 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -2,9 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileSearch.h" +#include "Common/StringUtil.h" -#include "Common.h" -#include "CommonPaths.h" #ifndef _WIN32 #include #include @@ -12,11 +16,6 @@ #include #endif -#include - -#include "FileSearch.h" -#include "StringUtil.h" - CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) { diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 02c2b2aec5..561435fb16 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -2,36 +2,35 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include +#include -#include "CommonPaths.h" -#include "FileUtil.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" #ifdef _WIN32 -#include -#include // for SHGetFolderPath -#include #include // for GetSaveFileName -#include #include // getcwd +#include +#include +#include // for SHGetFolderPath +#include #else -#include -#include #include #include -#include #include +#include +#include +#include #endif -#include #if defined(__APPLE__) +#include #include #include -#include #endif -#include -#include - #ifndef S_ISDIR #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #endif diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 61dd618c1b..1b49d4d269 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -4,14 +4,14 @@ #pragma once -#include #include +#include #include -#include #include +#include -#include "Common.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" // User directory indices for GetUserPath enum { diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index ab017347e8..df1010c419 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "Hash.h" +#include "Common/Hash.h" #if _M_SSE >= 0x402 -#include "CPUDetect.h" +#include "Common/CPUDetect.h" #include #endif diff --git a/Source/Core/Common/Hash.h b/Source/Core/Common/Hash.h index 23a54cd47d..a27a1c7e92 100644 --- a/Source/Core/Common/Hash.h +++ b/Source/Core/Common/Hash.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp index 6999c58693..8430f01e5e 100644 --- a/Source/Core/Common/IniFile.cpp +++ b/Source/Core/Common/IniFile.cpp @@ -5,18 +5,17 @@ // see IniFile.h -#include -#include - +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include "FileUtil.h" -#include "StringUtil.h" -#include "IniFile.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Common/StringUtil.h" namespace { diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 4d87b6bea8..c057b325b4 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -5,11 +5,11 @@ #pragma once #include -#include #include +#include #include -#include "StringUtil.h" +#include "Common/StringUtil.h" struct CaseInsensitiveStringCompare { diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index 5103db96f0..20c689de13 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -4,9 +4,11 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" +#include "Common/FileUtil.h" + // On disk format: //header{ // u32 'DCAC'; diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 45bcd53db4..a880b66268 100644 --- a/Source/Core/Common/LogManager.cpp +++ b/Source/Core/Common/LogManager.cpp @@ -5,12 +5,12 @@ #include #ifdef ANDROID -#include "Host.h" +#include "Core/Host.h" #endif -#include "LogManager.h" -#include "Timer.h" -#include "Thread.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" +#include "Common/Timer.h" void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char* fmt, ...) diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h index 36b197cc3e..ffd2e7efd5 100644 --- a/Source/Core/Common/LogManager.h +++ b/Source/Core/Common/LogManager.h @@ -4,14 +4,14 @@ #pragma once -#include "Log.h" -#include "StringUtil.h" -#include "Thread.h" -#include "FileUtil.h" - #include #include +#include "Common/FileUtil.h" +#include "Common/Log.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" + #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 diff --git a/Source/Core/Common/MathUtil.cpp b/Source/Core/Common/MathUtil.cpp index c92e659890..5b3f870d9f 100644 --- a/Source/Core/Common/MathUtil.cpp +++ b/Source/Core/Common/MathUtil.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MathUtil.h" - #include #include +#include "Common/MathUtil.h" + namespace MathUtil { diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h index ecb264cbec..2cd1d8f3a6 100644 --- a/Source/Core/Common/MathUtil.h +++ b/Source/Core/Common/MathUtil.h @@ -4,10 +4,10 @@ #pragma once -#include "Common.h" - #include -#include "FPURoundMode.h" + +#include "Common/Common.h" +#include "Common/FPURoundMode.h" namespace MathUtil { diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 699005dd52..4a7c30538c 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -4,9 +4,9 @@ #include -#include "MemoryUtil.h" -#include "MemArena.h" -#include "StringUtil.h" +#include "Common/MemArena.h" +#include "Common/MemoryUtil.h" +#include "Common/StringUtil.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h index 5cd952d23a..59e62c0009 100644 --- a/Source/Core/Common/MemArena.h +++ b/Source/Core/Common/MemArena.h @@ -8,7 +8,7 @@ #include #endif -#include "Common.h" +#include "Common/Common.h" // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. // Multiple views can mirror the same section of the block, which makes it very convenient for emulating diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 242fdbcb81..e65f0a1cbb 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "Common.h" -#include "MemoryUtil.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/MemoryUtil.h" +#include "Common/StringUtil.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/Misc.cpp b/Source/Core/Common/Misc.cpp index ce42deb4d2..71a140c69b 100644 --- a/Source/Core/Common/Misc.cpp +++ b/Source/Core/Common/Misc.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" // Neither Android nor OS X support TLS #if defined(__APPLE__) || (ANDROID && __clang__) diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index 0fa1cf39b8..bbfa10d233 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include // System +#include -#include "Common.h" // Local -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.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 52e3904536..b4e89a5d60 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonPaths.h" -#include "FileUtil.h" -#include "NandPaths.h" #include +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" + namespace Common { diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h index f1fd151007..cdaf1a7676 100644 --- a/Source/Core/Common/NandPaths.h +++ b/Source/Core/Common/NandPaths.h @@ -5,7 +5,7 @@ #pragma once #include -#include "CommonTypes.h" +#include "Common/CommonTypes.h" #define TITLEID_SYSMENU 0x0000000100000002ull diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 5475cf131d..e73aa26204 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -28,15 +28,15 @@ // A simple and portable piece of code used to generate a blank FAT32 image file. // Modified for Dolphin. -#include "SDCardUtil.h" -#include "FileUtil.h" - -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include + +#include "Common/FileUtil.h" +#include "Common/SDCardUtil.h" #ifndef _WIN32 #include // for unlink() diff --git a/Source/Core/Common/SDCardUtil.h b/Source/Core/Common/SDCardUtil.h index e684720987..6f95b2c96b 100644 --- a/Source/Core/Common/SDCardUtil.h +++ b/Source/Core/Common/SDCardUtil.h @@ -4,6 +4,6 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename); diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp index b368a7171a..b7a7aeedbd 100644 --- a/Source/Core/Common/SettingsHandler.cpp +++ b/Source/Core/Common/SettingsHandler.cpp @@ -4,20 +4,20 @@ // Thanks to Treeki for writing the original class - 29/01/2012 -#include "CommonPaths.h" -#include "Timer.h" -#include "SettingsHandler.h" - -#include +#include #ifdef _WIN32 -#include #include #include +#include #else #include #endif +#include "Common/CommonPaths.h" +#include "Common/SettingsHandler.h" +#include "Common/Timer.h" + SettingsHandler::SettingsHandler() { Reset(); diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h index c6bbab9e9b..238e2d85eb 100644 --- a/Source/Core/Common/SettingsHandler.h +++ b/Source/Core/Common/SettingsHandler.h @@ -8,7 +8,7 @@ #include -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class SettingsHandler { diff --git a/Source/Core/Common/StdConditionVariable.h b/Source/Core/Common/StdConditionVariable.h index 68e1f187dc..2f537d19fc 100644 --- a/Source/Core/Common/StdConditionVariable.h +++ b/Source/Core/Common/StdConditionVariable.h @@ -36,7 +36,7 @@ // partial std::condition_variable implementation for win32/pthread -#include "StdMutex.h" +#include "Common/StdMutex.h" #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) #define USE_RVALUE_REFERENCES diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 7d8825231e..3031669323 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include #include +#include +#include -#include "CommonPaths.h" -#include "StringUtil.h" +#include "Common/CommonPaths.h" +#include "Common/StringUtil.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index d44432837c..31e20e360c 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -4,14 +4,13 @@ #pragma once -#include - -#include -#include -#include +#include #include +#include +#include +#include -#include "Common.h" +#include "Common/Common.h" std::string StringFromFormat(const char* format, ...) #if !defined _WIN32 diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index e7a716de0f..b44922ff6e 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SymbolDB.h" +#include "Common/SymbolDB.h" void SymbolDB::List() diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h index 348bdb5055..2166531cc0 100644 --- a/Source/Core/Common/SymbolDB.h +++ b/Source/Core/Common/SymbolDB.h @@ -7,11 +7,11 @@ #pragma once -#include #include +#include #include -#include "Common.h" +#include "Common/Common.h" struct SCall { diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp index 6948e7db31..cb634b22b9 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Common/SysConf.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "SysConf.h" - #include +#include "Common/FileUtil.h" +#include "Common/SysConf.h" + SysConf::SysConf() : m_IsValid(false) { diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h index 1b4706e74a..0594a9dda2 100644 --- a/Source/Core/Common/SysConf.h +++ b/Source/Core/Common/SysConf.h @@ -7,6 +7,8 @@ #include #include +#include "Common/Common.h" + // This class is meant to edit the values in a given Wii SYSCONF file // It currently does not add/remove/rearrange sections, // instead only modifies exiting sections' data diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index 740750a8ea..ce52375c3d 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Thread.h" -#include "Common.h" +#include "Common/Common.h" +#include "Common/Thread.h" #ifdef __APPLE__ #include diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index 4eda7ae9ec..999689cf72 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -4,14 +4,14 @@ #pragma once -#include "StdConditionVariable.h" -#include "StdMutex.h" -#include "StdThread.h" +#include +#include // Don't include common.h here as it will break LogManager -#include "CommonTypes.h" -#include -#include +#include "Common/CommonTypes.h" +#include "Common/StdConditionVariable.h" +#include "Common/StdMutex.h" +#include "Common/StdThread.h" // This may not be defined outside _WIN32 #ifndef _WIN32 diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 8faf502c90..1670e861db 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #ifdef _WIN32 -#include #include #include +#include #else #include #endif -#include "Timer.h" -#include "StringUtil.h" +#include "Common/StringUtil.h" +#include "Common/Timer.h" namespace Common { diff --git a/Source/Core/Common/Timer.h b/Source/Core/Common/Timer.h index 851f48b7a4..6e0d666299 100644 --- a/Source/Core/Common/Timer.h +++ b/Source/Core/Common/Timer.h @@ -4,8 +4,8 @@ #pragma once -#include "CommonTypes.h" #include +#include "Common/CommonTypes.h" namespace Common { diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 09bfa9b1af..1223bf373d 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" #include "scmrev.h" +#include "Common/Common.h" #ifdef _DEBUG #define BUILD_TYPE_STR "Debug " diff --git a/Source/Core/Common/stdafx.cpp b/Source/Core/Common/stdafx.cpp index b602b39925..f75affca28 100644 --- a/Source/Core/Common/stdafx.cpp +++ b/Source/Core/Common/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "Common/stdafx.h" diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h index 8b1c934c4f..832a942e21 100644 --- a/Source/Core/Common/stdafx.h +++ b/Source/Core/Common/stdafx.h @@ -18,7 +18,7 @@ #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 */ -#include #include #include +#include diff --git a/Source/Core/Common/x64ABI.cpp b/Source/Core/Common/x64ABI.cpp index 6cced10084..ce7ce5d94d 100644 --- a/Source/Core/Common/x64ABI.cpp +++ b/Source/Core/Common/x64ABI.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "x64ABI.h" -#include "x64Emitter.h" +#include "Common/x64ABI.h" +#include "Common/x64Emitter.h" using namespace Gen; diff --git a/Source/Core/Common/x64ABI.h b/Source/Core/Common/x64ABI.h index c08480c2b6..75ca8fe1d7 100644 --- a/Source/Core/Common/x64ABI.h +++ b/Source/Core/Common/x64ABI.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // x86/x64 ABI:s, and helpers to help follow them when JIT-ing code. // All convensions return values in EAX (+ possibly EDX). diff --git a/Source/Core/Common/x64Analyzer.cpp b/Source/Core/Common/x64Analyzer.cpp index eac178ff21..c8115dca75 100644 --- a/Source/Core/Common/x64Analyzer.cpp +++ b/Source/Core/Common/x64Analyzer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "x64Analyzer.h" +#include "Common/x64Analyzer.h" bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info) { diff --git a/Source/Core/Common/x64Analyzer.h b/Source/Core/Common/x64Analyzer.h index 110e50de28..613aafad73 100644 --- a/Source/Core/Common/x64Analyzer.h +++ b/Source/Core/Common/x64Analyzer.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" struct InstructionInfo { diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index b9ed2b538a..f9a51608e6 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -2,8 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include "Common.h" +#include + +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/StringUtil.h" #ifdef _WIN32 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set @@ -85,10 +88,6 @@ static unsigned long long _xgetbv(unsigned int index) #endif -#include "Common.h" -#include "CPUDetect.h" -#include "StringUtil.h" - CPUInfo cpu_info; CPUInfo::CPUInfo() { diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 76e235ebcd..fa6c42cfb0 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "x64Emitter.h" -#include "x64ABI.h" -#include "CPUDetect.h" - #include +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/x64ABI.h" +#include "Common/x64Emitter.h" + namespace Gen { diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index b3ec34bf0c..52db3c20a8 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -6,8 +6,8 @@ #pragma once -#include "Common.h" -#include "MemoryUtil.h" +#include "Common/Common.h" +#include "Common/MemoryUtil.h" namespace Gen { diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index 34438d12b2..ae061cbebd 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FPURoundMode.h" -#include "CPUDetect.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/FPURoundMode.h" #ifndef _WIN32 static const unsigned short FPU_ROUND_NEAR = 0 << 10; diff --git a/Source/Core/Core/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp index 37e50bb75e..8a9c4c6e81 100644 --- a/Source/Core/Core/ARDecrypt.cpp +++ b/Source/Core/Core/ARDecrypt.cpp @@ -6,14 +6,14 @@ // GCNcrypt - Gamecube AR Crypto Program // Copyright (C) 2003-2004 Parasyte - -#include "ARDecrypt.h" #include #ifdef _WIN32 #include #endif +#include "Core/ARDecrypt.h" + namespace ActionReplay { diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h index 792518c020..7c2e89844b 100644 --- a/Source/Core/Core/ARDecrypt.h +++ b/Source/Core/Core/ARDecrypt.h @@ -5,8 +5,9 @@ #pragma once #include -#include "Common.h" -#include "ActionReplay.h" + +#include "Common/Common.h" +#include "Core/ActionReplay.h" namespace ActionReplay { diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index 6da6f66884..411dbe00fd 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -22,14 +22,15 @@ #include #include -#include "Common.h" -#include "StringUtil.h" -#include "HW/Memmap.h" -#include "ActionReplay.h" -#include "Core.h" -#include "ARDecrypt.h" -#include "LogManager.h" -#include "ConfigManager.h" +#include "Common/Common.h" +#include "Common/LogManager.h" +#include "Common/StringUtil.h" + +#include "Core/ActionReplay.h" +#include "Core/ARDecrypt.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/Memmap.h" namespace ActionReplay { diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h index 36dd9db8f8..8479785749 100644 --- a/Source/Core/Core/ActionReplay.h +++ b/Source/Core/Core/ActionReplay.h @@ -4,7 +4,7 @@ #pragma once -#include "IniFile.h" +#include "Common/IniFile.h" namespace ActionReplay { diff --git a/Source/Core/Core/ArmMemTools.cpp b/Source/Core/Core/ArmMemTools.cpp index 262c59fc53..29a578e495 100644 --- a/Source/Core/Core/ArmMemTools.cpp +++ b/Source/Core/Core/ArmMemTools.cpp @@ -1,36 +1,23 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#include +#include #include #ifdef ANDROID #include #else -#include // Look in here for the context definition. #include +#include // Look in here for the context definition. #endif -#include "Common.h" -#include "MemTools.h" -#include "HW/Memmap.h" -#include "PowerPC/PowerPC.h" -#include "PowerPC/JitInterface.h" -#include "PowerPC/JitCommon/JitBase.h" +#include "Common/Common.h" +#include "Core/MemTools.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitCommon/JitBase.h" namespace EMM { diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 7691421623..6c79bd2f21 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -3,37 +3,35 @@ // Refer to the license.txt file included. -#include "Common.h" // Common -#include "StringUtil.h" -#include "FileUtil.h" -#include "MathUtil.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/Hash.h" +#include "Common/MathUtil.h" +#include "Common/StringUtil.h" -#include "../HLE/HLE.h" // Core -#include "../PowerPC/PowerPC.h" -#include "../PowerPC/PPCAnalyst.h" -#include "../Core.h" -#include "../HW/EXI_DeviceIPL.h" -#include "../HW/Memmap.h" -#include "../HW/ProcessorInterface.h" -#include "../HW/DVDInterface.h" -#include "../HW/VideoInterface.h" -#include "../IPC_HLE/WII_IPC_HLE.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/PatchEngine.h" +#include "Core/VolumeHandler.h" +#include "Core/Boot/Boot.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/VideoInterface.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/SignatureDB.h" -#include "../Debugger/Debugger_SymbolMap.h" // Debugger - -#include "Boot_DOL.h" -#include "Boot.h" -#include "../Host.h" -#include "../VolumeHandler.h" -#include "../PatchEngine.h" -#include "../PowerPC/SignatureDB.h" -#include "../PowerPC/PPCSymbolDB.h" - -#include "../ConfigManager.h" -#include "VolumeCreator.h" // DiscIO -#include "NANDContentLoader.h" -#include "Hash.h" -#include "CommonPaths.h" +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/VolumeCreator.h" void CBoot::Load_FST(bool _bIsWii) { diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h index d7df3390e1..f580e8a98a 100644 --- a/Source/Core/Core/Boot/Boot.h +++ b/Source/Core/Core/Boot/Boot.h @@ -7,9 +7,9 @@ #include #include -#include "../CoreParameter.h" +#include "Core/CoreParameter.h" -#include "Volume.h" +#include "DiscIO/Volume.h" using DiscIO::IVolume; typedef struct CountrySetting diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 1059bf7c4f..7891a56819 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -2,27 +2,26 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" -#include "FileUtil.h" -#include "NandPaths.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" +#include "Common/SettingsHandler.h" -#include "../PowerPC/PowerPC.h" -#include "../Core.h" -#include "../HW/EXI_DeviceIPL.h" -#include "../HW/Memmap.h" -#include "../HW/DVDInterface.h" -#include "../HW/CPU.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/MemTools.h" +#include "Core/PatchEngine.h" +#include "Core/VolumeHandler.h" +#include "Core/Boot/Boot.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" -#include "../VolumeHandler.h" -#include "../PatchEngine.h" -#include "../MemTools.h" - -#include "../ConfigManager.h" -#include "VolumeCreator.h" -#include "Boot.h" -#include "HLE/HLE.h" -#include "SettingsHandler.h" +#include "DiscIO/VolumeCreator.h" void CBoot::RunFunction(u32 _iAddr) { diff --git a/Source/Core/Core/Boot/Boot_DOL.cpp b/Source/Core/Core/Boot/Boot_DOL.cpp index 58316576a5..a641a9b947 100644 --- a/Source/Core/Core/Boot/Boot_DOL.cpp +++ b/Source/Core/Core/Boot/Boot_DOL.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Boot_DOL.h" -#include "FileUtil.h" -#include "../HW/Memmap.h" -#include "CommonFuncs.h" +#include "Common/CommonFuncs.h" +#include "Common/FileUtil.h" + +#include "Core/Boot/Boot_DOL.h" +#include "Core/HW/Memmap.h" CDolLoader::CDolLoader(u8* _pBuffer, u32 _Size) : m_isWii(false) diff --git a/Source/Core/Core/Boot/Boot_DOL.h b/Source/Core/Core/Boot/Boot_DOL.h index 23214ff994..e406875f8a 100644 --- a/Source/Core/Core/Boot/Boot_DOL.h +++ b/Source/Core/Core/Boot/Boot_DOL.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class CDolLoader { diff --git a/Source/Core/Core/Boot/Boot_ELF.cpp b/Source/Core/Core/Boot/Boot_ELF.cpp index 725332685b..5f4b41b27d 100644 --- a/Source/Core/Core/Boot/Boot_ELF.cpp +++ b/Source/Core/Core/Boot/Boot_ELF.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../PowerPC/PowerPC.h" -#include "Boot.h" -#include "../HLE/HLE.h" -#include "Boot_ELF.h" -#include "ElfReader.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" + +#include "Core/Boot/Boot.h" +#include "Core/Boot/Boot_ELF.h" +#include "Core/Boot/ElfReader.h" +#include "Core/HLE/HLE.h" +#include "Core/PowerPC/PowerPC.h" bool CBoot::IsElfWii(const char *filename) { diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index ac950d5038..99235c8e36 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -2,25 +2,26 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Boot.h" -#include "../PowerPC/PowerPC.h" -#include "../HLE/HLE.h" -#include "../HW/Memmap.h" -#include "../ConfigManager.h" -#include "../PatchEngine.h" -#include "../IPC_HLE/WII_IPC_HLE.h" -#include "../IPC_HLE/WII_IPC_HLE_Device_FileIO.h" - -#include "WiiWad.h" -#include "NANDContentLoader.h" -#include "FileUtil.h" -#include "Boot_DOL.h" -#include "Volume.h" -#include "VolumeCreator.h" -#include "CommonPaths.h" - #include +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/PatchEngine.h" +#include "Core/Boot/Boot.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/Memmap.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" +#include "Core/PowerPC/PowerPC.h" + +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/Volume.h" +#include "DiscIO/VolumeCreator.h" +#include "DiscIO/WiiWad.h" + static u32 state_checksum(u32 *buf, int len) { u32 checksum = 0; diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp index bfbeb91a3b..21fc4188ac 100644 --- a/Source/Core/Core/Boot/ElfReader.cpp +++ b/Source/Core/Core/Boot/ElfReader.cpp @@ -4,11 +4,12 @@ #include -#include "Common.h" -#include "../Debugger/Debugger_SymbolMap.h" -#include "../HW/Memmap.h" -#include "../PowerPC/PPCSymbolDB.h" -#include "ElfReader.h" +#include "Common/Common.h" + +#include "Core/Boot/ElfReader.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PPCSymbolDB.h" void bswap(Elf32_Word &w) {w = Common::swap32(w);} void bswap(Elf32_Half &w) {w = Common::swap16(w);} diff --git a/Source/Core/Core/Boot/ElfReader.h b/Source/Core/Core/Boot/ElfReader.h index 7cf2fef997..a789515af8 100644 --- a/Source/Core/Core/Boot/ElfReader.h +++ b/Source/Core/Core/Boot/ElfReader.h @@ -4,7 +4,7 @@ #pragma once -#include "ElfTypes.h" +#include "Core/Boot/ElfTypes.h" enum KnownElfTypes { diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 651ff5e302..35f311ba32 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -23,22 +23,22 @@ #include #include -#include "CommonTypes.h" -#include "CommonPaths.h" -#include "IniFile.h" -#include "BootManager.h" -#include "Volume.h" -#include "VolumeCreator.h" -#include "ConfigManager.h" -#include "SysConf.h" -#include "Core.h" -#include "Host.h" -#include "VideoBackendBase.h" -#include "Movie.h" -#include "NetPlayProto.h" -#include "HW/WiimoteReal/WiimoteReal.h" -#include "HW/SI.h" -#include "HW/EXI.h" +#include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" +#include "Common/IniFile.h" +#include "Common/SysConf.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" +#include "Core/HW/EXI.h" +#include "Core/HW/SI.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" +#include "DiscIO/Volume.h" +#include "DiscIO/VolumeCreator.h" +#include "VideoCommon/VideoBackendBase.h" namespace BootManager { diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 0a831a83a9..156892972c 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" -#include "ConfigManager.h" -#include "IniFile.h" -#include "FileUtil.h" -#include "NANDContentLoader.h" -#include "HW/SI.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Core/ConfigManager.h" +#include "Core/HW/SI.h" +#include "DiscIO/NANDContentLoader.h" SConfig* SConfig::m_Instance; diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 66b5e0eb1f..b3c1f4a3f1 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -7,10 +7,10 @@ #include #include -#include "Boot/Boot.h" -#include "HW/EXI_Device.h" -#include "HW/SI_Device.h" -#include "SysConf.h" +#include "Common/SysConf.h" +#include "Core/Boot/Boot.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/SI_Device.h" // DSP Backend Types #define BACKEND_NULLSOUND _trans("No audio output") diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index c097c9e673..ad3cbd6f8f 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -4,62 +4,59 @@ #ifdef _WIN32 #include -#include "EmuWindow.h" +#include "VideoCommon/EmuWindow.h" #endif -#include "Atomic.h" -#include "Thread.h" -#include "Timer.h" -#include "Common.h" -#include "CommonPaths.h" -#include "StringUtil.h" -#include "MathUtil.h" -#include "MemoryUtil.h" +#include "AudioCommon/AudioCommon.h" -#include "Core.h" -#include "CPUDetect.h" -#include "CoreTiming.h" -#include "Boot/Boot.h" -#include "FifoPlayer/FifoPlayer.h" +#include "Common/Atomic.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/CPUDetect.h" +#include "Common/LogManager.h" +#include "Common/MathUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" +#include "Common/Timer.h" -#include "HW/Memmap.h" -#include "HW/ProcessorInterface.h" -#include "HW/GPFifo.h" -#include "HW/CPU.h" -#include "HW/GCPad.h" -#include "HW/Wiimote.h" -#include "HW/HW.h" -#include "HW/DSP.h" -#include "HW/GPFifo.h" -#include "HW/AudioInterface.h" -#include "HW/VideoInterface.h" -#include "HW/EXI.h" -#include "HW/SystemTimers.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/DSPEmulator.h" +#include "Core/Host.h" +#include "Core/MemTools.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" +#include "Core/PatchEngine.h" +#include "Core/State.h" +#include "Core/VolumeHandler.h" +#include "Core/Boot/Boot.h" +#include "Core/FifoPlayer/FifoPlayer.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/EXI.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/HW.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/HW/Wiimote.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" -#include "PowerPC/PowerPC.h" #ifdef USE_GDBSTUB -#include "PowerPC/GDBStub.h" +#include "Core/PowerPC/GDBStub.h" #endif -#include "DSPEmulator.h" -#include "ConfigManager.h" -#include "VideoBackendBase.h" -#include "AudioCommon.h" -#include "OnScreenDisplay.h" +#include "DiscIO/FileMonitor.h" -#include "VolumeHandler.h" -#include "FileMonitor.h" - -#include "MemTools.h" -#include "Host.h" -#include "LogManager.h" - -#include "State.h" -#include "Movie.h" -#include "NetPlayProto.h" -#include "PatchEngine.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/VideoBackendBase.h" // TODO: ugly, remove bool g_aspect_wide; diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index e24a7e7ac8..4e750108dc 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -11,11 +11,11 @@ #pragma once -#include #include +#include -#include "CommonTypes.h" -#include "CoreParameter.h" +#include "Common/CommonTypes.h" +#include "Core/CoreParameter.h" namespace Core { diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 8aee3eb5c8..4cfec8c7c6 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -2,24 +2,24 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" -#include "FileUtil.h" -#include "StringUtil.h" -#include "CDUtils.h" -#include "NANDContentLoader.h" - -#include "VolumeCreator.h" // DiscIO - -#include "Boot/Boot.h" // Core -#include "Boot/Boot_DOL.h" -#include "CoreParameter.h" -#include "ConfigManager.h" -#include "Core.h" // for bWii -#include "FifoPlayer/FifoDataFile.h" - #include +#include "Common/CDUtils.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" // for bWii +#include "Core/CoreParameter.h" +#include "Core/Boot/Boot.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/FifoPlayer/FifoDataFile.h" + +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/VolumeCreator.h" + SCoreStartupParameter::SCoreStartupParameter() : hInstance(0), bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false), diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index ee3b11bd79..fc8386b5bb 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -4,9 +4,10 @@ #pragma once -#include "IniFile.h" #include +#include "Common/IniFile.h" + enum Hotkey { HK_OPEN, diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index 9b4e87747f..248ca85e15 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -2,16 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include -#include "Thread.h" -#include "PowerPC/PowerPC.h" -#include "CoreTiming.h" -#include "Core.h" -#include "StringUtil.h" -#include "VideoBackendBase.h" -#include "FifoQueue.h" +#include "Common/FifoQueue.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" + +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" #define MAX_SLICE_LENGTH 20000 diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index 21d0e1c2a3..29c425ac6c 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -17,11 +17,10 @@ // inside callback: // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") -#include "Common.h" - #include -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" namespace CoreTiming { diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp index bd21086a9c..dfad0e10a2 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/DSP/DSPAccelerator.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "MathUtil.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" -#include "DSPCore.h" -#include "DSPHost.h" -#include "DSPHWInterface.h" -#include "DSPInterpreter.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHost.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" // The hardware adpcm decoder :) static s16 ADPCM_Step(u32& _rSamplePos) diff --git a/Source/Core/Core/DSP/DSPAnalyzer.cpp b/Source/Core/Core/DSP/DSPAnalyzer.cpp index 043451f21e..919d815e35 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.cpp +++ b/Source/Core/Core/DSP/DSPAnalyzer.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPAnalyzer.h" -#include "DSPInterpreter.h" -#include "DSPTables.h" -#include "DSPMemoryMap.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPTables.h" namespace DSPAnalyzer { diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h index 5af1db370d..17121b5cbe 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.h +++ b/Source/Core/Core/DSP/DSPAnalyzer.h @@ -4,7 +4,7 @@ #pragma once -#include "DSPInterpreter.h" +#include "Core/DSP/DSPInterpreter.h" // Basic code analysis. namespace DSPAnalyzer diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h index e83540f6ad..6f07679a5a 100644 --- a/Source/Core/Core/DSP/DSPBreakpoints.h +++ b/Source/Core/Core/DSP/DSPBreakpoints.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // super fast breakpoints for a limited range. // To be used interchangeably with the BreakPoints class. diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index f2f4e5b79d..6cafd66561 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -5,13 +5,13 @@ #include #include -#include "Common.h" -#include "FileUtil.h" -#include "StringUtil.h" -#include "DSPCodeUtil.h" -#include "assemble.h" -#include "disassemble.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" +#include "Core/DSP/assemble.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPCodeUtil.h" bool Assemble(const char *text, std::vector &code, bool force) { diff --git a/Source/Core/Core/DSP/DSPCodeUtil.h b/Source/Core/Core/DSP/DSPCodeUtil.h index 004cc884c3..ccfa9c97ce 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.h +++ b/Source/Core/Core/DSP/DSPCodeUtil.h @@ -7,7 +7,7 @@ #include #include -#include "Common.h" +#include "Common/Common.h" bool Assemble(const char *text, std::vector &code, bool force = false); bool Disassemble(const std::vector &code, bool line_numbers, std::string &text); diff --git a/Source/Core/Core/DSP/DSPCommon.h b/Source/Core/Core/DSP/DSPCommon.h index db171f3154..d3bf7fcdb5 100644 --- a/Source/Core/Core/DSP/DSPCommon.h +++ b/Source/Core/Core/DSP/DSPCommon.h @@ -4,5 +4,6 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" + typedef u16 UDSPInstruction; diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index 1796a1bf56..caaedf74cc 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -23,18 +23,18 @@ ====================================================================*/ -#include "Common.h" -#include "Hash.h" -#include "Thread.h" -#include "DSPCore.h" -#include "DSPEmitter.h" -#include "DSPHost.h" -#include "DSPAnalyzer.h" -#include "MemoryUtil.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/Hash.h" +#include "Common/MemoryUtil.h" +#include "Common/Thread.h" -#include "DSPHWInterface.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPHost.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPIntUtil.h" SDSP g_dsp; DSPBreakpoints dsp_breakpoints; diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h index 8411a07e72..88c8308961 100644 --- a/Source/Core/Core/DSP/DSPCore.h +++ b/Source/Core/Core/DSP/DSPCore.h @@ -25,10 +25,10 @@ #pragma once -#include "Thread.h" +#include "Common/Thread.h" -#include "DSPBreakpoints.h" -#include "DSPEmitter.h" +#include "Core/DSP/DSPBreakpoints.h" +#include "Core/DSP/DSPEmitter.h" #define DSP_IRAM_BYTE_SIZE 0x2000 #define DSP_IRAM_SIZE 0x1000 diff --git a/Source/Core/Core/DSP/DSPEmitter.cpp b/Source/Core/Core/DSP/DSPEmitter.cpp index d0d842b7aa..7ef3169991 100644 --- a/Source/Core/Core/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/DSP/DSPEmitter.cpp @@ -4,12 +4,12 @@ #include -#include "DSPEmitter.h" -#include "DSPMemoryMap.h" -#include "DSPCore.h" -#include "DSPHost.h" -#include "DSPInterpreter.h" -#include "DSPAnalyzer.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPHost.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" #define MAX_BLOCK_SIZE 250 #define DSP_IDLE_SKIP_CYCLES 0x1000 diff --git a/Source/Core/Core/DSP/DSPEmitter.h b/Source/Core/Core/DSP/DSPEmitter.h index 9f8ffe7727..1d6e60a899 100644 --- a/Source/Core/Core/DSP/DSPEmitter.h +++ b/Source/Core/Core/DSP/DSPEmitter.h @@ -6,14 +6,14 @@ #include -#include "DSPCommon.h" -#include "x64ABI.h" -#include "x64Emitter.h" -#include "Jit/DSPJitRegCache.h" +#include "Common/x64ABI.h" +#include "Common/x64Emitter.h" + +#include "Core/DSP/DSPCommon.h" +#include "Core/DSP/Jit/DSPJitRegCache.h" #define COMPILED_CODE_SIZE 2097152 - -#define MAX_BLOCKS 0x10000 +#define MAX_BLOCKS 0x10000 typedef u32 (*DSPCompiledCode)(); typedef const u8 *Block; diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index 5eceeb257e..12a01ee375 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -23,18 +23,18 @@ ====================================================================*/ -#include "Atomic.h" -#include "Thread.h" -#include "MemoryUtil.h" +#include "Common/Atomic.h" +#include "Common/CPUDetect.h" +#include "Common/MemoryUtil.h" +#include "Common/Thread.h" -#include "DSPCore.h" -#include "DSPHost.h" -#include "DSPTables.h" -#include "DSPAnalyzer.h" -#include "DSPAccelerator.h" -#include "DSPInterpreter.h" -#include "DSPHWInterface.h" -#include "CPUDetect.h" +#include "Core/DSP/DSPAccelerator.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHost.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPTables.h" #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) #include diff --git a/Source/Core/Core/DSP/DSPHWInterface.h b/Source/Core/Core/DSP/DSPHWInterface.h index 3d16b0d9a6..331762ee2b 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.h +++ b/Source/Core/Core/DSP/DSPHWInterface.h @@ -25,7 +25,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" #define GDSP_MBOX_CPU 0 #define GDSP_MBOX_DSP 1 diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/DSP/DSPIntCCUtil.cpp index d2631d2685..5aa6871839 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.cpp +++ b/Source/Core/Core/DSP/DSPIntCCUtil.cpp @@ -7,9 +7,9 @@ // HELPER FUNCTIONS -#include "DSPIntCCUtil.h" -#include "DSPCore.h" -#include "DSPInterpreter.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/DSPIntCCUtil.h index 31e3bbf608..f25b05ae61 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.h +++ b/Source/Core/Core/DSP/DSPIntCCUtil.h @@ -8,7 +8,7 @@ // Anything to do with SR and conditions goes here. -#include "Common.h" +#include "Common/Common.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntExtOps.cpp b/Source/Core/Core/DSP/DSPIntExtOps.cpp index a628b9b4d1..fd50e67b8f 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.cpp +++ b/Source/Core/Core/DSP/DSPIntExtOps.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPIntUtil.h" -#include "DSPMemoryMap.h" #include "DSPIntExtOps.h" +#include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" //not needed for game ucodes (it slows down interpreter/dspjit32 + easier to compare int VS dspjit64 without it) //#define PRECISE_BACKLOG @@ -34,7 +34,7 @@ namespace Ext inline bool IsSameMemArea(u16 a, u16 b) { -//LM: tested on WII + //LM: tested on WII if ((a>>10)==(b>>10)) return true; else diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/DSPIntExtOps.h index 353a39ac84..dbe1d07f0f 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.h +++ b/Source/Core/Core/DSP/DSPIntExtOps.h @@ -25,7 +25,7 @@ #pragma once -#include "DSPTables.h" +#include "Core/DSP/DSPTables.h" // Extended opcode support. // Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h index b8c78184ea..19ab6f7ad9 100644 --- a/Source/Core/Core/DSP/DSPIntUtil.h +++ b/Source/Core/Core/DSP/DSPIntUtil.h @@ -25,12 +25,12 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" -#include "DSPInterpreter.h" -#include "DSPCore.h" -#include "DSPMemoryMap.h" -#include "DSPStacks.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPStacks.h" // --------------------------------------------------------------------------------------- diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp index 9b33cb6b33..4898dbe924 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/DSPInterpreter.cpp @@ -23,12 +23,11 @@ ====================================================================*/ -#include "DSPTables.h" -#include "DSPCore.h" -#include "DSPAnalyzer.h" - -#include "DSPHWInterface.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPTables.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/DSPInterpreter.h index 6ceb077ef0..641ef05d26 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.h +++ b/Source/Core/Core/DSP/DSPInterpreter.h @@ -4,7 +4,7 @@ #pragma once -#include "DSPTables.h" +#include "Core/DSP/DSPTables.h" #define DSP_REG_MASK 0x1f diff --git a/Source/Core/Core/DSP/DSPMemoryMap.cpp b/Source/Core/Core/DSP/DSPMemoryMap.cpp index 9bd5b19acc..4120acbf61 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/DSP/DSPMemoryMap.cpp @@ -23,10 +23,10 @@ ====================================================================*/ -#include "DSPInterpreter.h" -#include "DSPMemoryMap.h" -#include "DSPHWInterface.h" -#include "DSPCore.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" u16 dsp_imem_read(u16 addr) { diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h index 7f7296b1a8..f37f29981d 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/DSP/DSPMemoryMap.h @@ -25,9 +25,10 @@ #pragma once -#include "Common.h" -#include "DSPInterpreter.h" -#include "DSPCore.h" +#include "Common/Common.h" + +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPInterpreter.h" u16 dsp_imem_read(u16 addr); void dsp_dmem_write(u16 addr, u16 val); diff --git a/Source/Core/Core/DSP/DSPStacks.cpp b/Source/Core/Core/DSP/DSPStacks.cpp index 0bdff3be50..40b50f860c 100644 --- a/Source/Core/Core/DSP/DSPStacks.cpp +++ b/Source/Core/Core/DSP/DSPStacks.cpp @@ -23,10 +23,10 @@ ====================================================================*/ -#include "Common.h" +#include "Common/Common.h" -#include "DSPCore.h" -#include "DSPStacks.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPStacks.h" // Stacks. The stacks are outside the DSP RAM, in dedicated hardware. diff --git a/Source/Core/Core/DSP/DSPStacks.h b/Source/Core/Core/DSP/DSPStacks.h index 2ffcd08077..db228e5f67 100644 --- a/Source/Core/Core/DSP/DSPStacks.h +++ b/Source/Core/Core/DSP/DSPStacks.h @@ -25,7 +25,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" void dsp_reg_store_stack(int stack_reg, u16 val); u16 dsp_reg_load_stack(int stack_reg); diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index 20d27d468e..bacc0964ad 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -4,12 +4,12 @@ // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com) -#include "Common.h" -#include "DSPTables.h" +#include "Common/Common.h" -#include "DSPInterpreter.h" -#include "DSPIntExtOps.h" -#include "DSPEmitter.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPIntExtOps.h" +#include "Core/DSP/DSPTables.h" void nop(const UDSPInstruction opc) { diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h index 80a479a2ef..49e3ac9947 100644 --- a/Source/Core/Core/DSP/DSPTables.h +++ b/Source/Core/Core/DSP/DSPTables.h @@ -6,9 +6,8 @@ #pragma once -//nclude "Common.h" -#include "DSPEmitter.h" -#include "DSPCommon.h" +#include "Core/DSP/DSPCommon.h" +#include "Core/DSP/DSPEmitter.h" // The non-ADDR ones that end with _D are the opposite one - if the bit specify // ACC0, then ACC_D will be ACC1. diff --git a/Source/Core/Core/DSP/DspIntArithmetic.cpp b/Source/Core/Core/DSP/DspIntArithmetic.cpp index 6420dd4b0b..95a9665c0c 100644 --- a/Source/Core/Core/DSP/DspIntArithmetic.cpp +++ b/Source/Core/Core/DSP/DspIntArithmetic.cpp @@ -4,9 +4,9 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "DSPInterpreter.h" -#include "DSPIntCCUtil.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPIntUtil.h" // Arithmetic and accumulator control. diff --git a/Source/Core/Core/DSP/DspIntBranch.cpp b/Source/Core/Core/DSP/DspIntBranch.cpp index ecd1314e10..4dd92572fa 100644 --- a/Source/Core/Core/DSP/DspIntBranch.cpp +++ b/Source/Core/Core/DSP/DspIntBranch.cpp @@ -4,13 +4,12 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "DSPInterpreter.h" -#include "DSPCore.h" -#include "DSPMemoryMap.h" -#include "DSPStacks.h" - -#include "DSPIntCCUtil.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPStacks.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntLoadStore.cpp b/Source/Core/Core/DSP/DspIntLoadStore.cpp index 0b72b21290..43f58508dd 100644 --- a/Source/Core/Core/DSP/DspIntLoadStore.cpp +++ b/Source/Core/Core/DSP/DspIntLoadStore.cpp @@ -4,10 +4,9 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "DSPInterpreter.h" - -#include "DSPMemoryMap.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntMisc.cpp b/Source/Core/Core/DSP/DspIntMisc.cpp index aec554d7fb..f03e4b9a28 100644 --- a/Source/Core/Core/DSP/DspIntMisc.cpp +++ b/Source/Core/Core/DSP/DspIntMisc.cpp @@ -4,11 +4,10 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPInterpreter.h" -#include "DSPInterpreter.h" - -#include "DSPCore.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntMultiplier.cpp b/Source/Core/Core/DSP/DspIntMultiplier.cpp index a1380879e8..bff947bded 100644 --- a/Source/Core/Core/DSP/DspIntMultiplier.cpp +++ b/Source/Core/Core/DSP/DspIntMultiplier.cpp @@ -7,10 +7,9 @@ // Multiplier and product register control -#include "DSPInterpreter.h" - -#include "DSPIntCCUtil.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPIntUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp index 5e2dfe7c14..f39057c1a6 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp @@ -4,10 +4,10 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "../DSPAnalyzer.h" -#include "../DSPEmitter.h" -#include "../DSPIntCCUtil.h" -#include "../DSPIntUtil.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPIntUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp index 49c94114b2..d8eb87f499 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../DSPAnalyzer.h" -#include "../DSPEmitter.h" -#include "../DSPMemoryMap.h" -#include "../DSPStacks.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/DSPStacks.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp index 62540ffe4f..fdaa67b3a5 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp @@ -4,8 +4,8 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "../DSPEmitter.h" -#include "../DSPIntUtil.h" // Helper functions +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPIntUtil.h" // Helper functions using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp index f18bc3de84..5ffa4081b4 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../DSPEmitter.h" -#include "../DSPMemoryMap.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPMemoryMap.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp index 765ecb39e4..b842111f74 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp @@ -4,9 +4,9 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "../DSPEmitter.h" -#include "../DSPIntCCUtil.h" -#include "../DSPIntUtil.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPIntUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp index 6da5b646f4..646339ff83 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../DSPEmitter.h" -#include "../DSPIntUtil.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPIntUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp index 00cec82e76..234226aab3 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp @@ -7,9 +7,9 @@ // Multiplier and product register control -#include "../DSPAnalyzer.h" -#include "../DSPEmitter.h" -#include "../DSPIntUtil.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPIntUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp index 6950daa6d1..9f351f9264 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPJitRegCache.h" -#include "../DSPEmitter.h" -#include "../DSPMemoryMap.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Jit/DSPJitRegCache.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h index c2e27a359c..9603964660 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h +++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h @@ -4,7 +4,7 @@ #pragma once -#include "x64Emitter.h" +#include "Common/x64Emitter.h" class DSPEmitter; diff --git a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp index dd7e042169..f32d0e5175 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPJitUtil.h" -#include "../DSPEmitter.h" -#include "../DSPHWInterface.h" -#include "../DSPMemoryMap.h" +#include "Core/DSP/DSPEmitter.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Jit/DSPJitUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/LabelMap.cpp b/Source/Core/Core/DSP/LabelMap.cpp index 1c836e7a69..57931a76db 100644 --- a/Source/Core/Core/DSP/LabelMap.cpp +++ b/Source/Core/Core/DSP/LabelMap.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "LabelMap.h" -#include "DSPTables.h" +#include "Core/DSP/DSPTables.h" +#include "Core/DSP/LabelMap.h" LabelMap::LabelMap() { diff --git a/Source/Core/Core/DSP/LabelMap.h b/Source/Core/Core/DSP/LabelMap.h index c0a822de81..6875b556cd 100644 --- a/Source/Core/Core/DSP/LabelMap.h +++ b/Source/Core/Core/DSP/LabelMap.h @@ -7,7 +7,7 @@ #include #include -#include "Common.h" +#include "Common/Common.h" enum LabelType { diff --git a/Source/Core/Core/DSP/assemble.cpp b/Source/Core/Core/DSP/assemble.cpp index 9924c576be..eecfc060c5 100644 --- a/Source/Core/Core/DSP/assemble.cpp +++ b/Source/Core/Core/DSP/assemble.cpp @@ -39,17 +39,17 @@ Initial import #include #include - -#include -#include #include +#include +#include -#include "Common.h" -#include "FileUtil.h" -#include "DSPInterpreter.h" -#include "DSPTables.h" -#include "disassemble.h" -#include "assemble.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" + +#include "Core/DSP/assemble.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPTables.h" static const char *err_string[] = { diff --git a/Source/Core/Core/DSP/assemble.h b/Source/Core/Core/DSP/assemble.h index 1412faf6b1..28a9db4981 100644 --- a/Source/Core/Core/DSP/assemble.h +++ b/Source/Core/Core/DSP/assemble.h @@ -24,13 +24,14 @@ #pragma once -#include #include +#include -#include "Common.h" -#include "disassemble.h" -#include "DSPTables.h" -#include "LabelMap.h" +#include "Common/Common.h" + +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPTables.h" +#include "Core/DSP/LabelMap.h" enum err_t { diff --git a/Source/Core/Core/DSP/disassemble.cpp b/Source/Core/Core/DSP/disassemble.cpp index af0eb91c29..462b480126 100644 --- a/Source/Core/Core/DSP/disassemble.cpp +++ b/Source/Core/Core/DSP/disassemble.cpp @@ -23,13 +23,14 @@ ====================================================================*/ -#include -#include +#include +#include -#include "Common.h" -#include "FileUtil.h" -#include "disassemble.h" -#include "DSPTables.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" + +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPTables.h" #ifdef _MSC_VER #pragma warning(disable:4996) diff --git a/Source/Core/Core/DSP/disassemble.h b/Source/Core/Core/DSP/disassemble.h index 1e3af70d3c..855ee9af35 100644 --- a/Source/Core/Core/DSP/disassemble.h +++ b/Source/Core/Core/DSP/disassemble.h @@ -27,9 +27,10 @@ #include #include -#include "Common.h" -#include "DSPTables.h" -#include "LabelMap.h" +#include "Common/Common.h" + +#include "Core/DSP/DSPTables.h" +#include "Core/DSP/LabelMap.h" struct AssemblerSettings { diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp index 52cae0d492..a15f5be6e6 100644 --- a/Source/Core/Core/DSPEmulator.cpp +++ b/Source/Core/Core/DSPEmulator.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPEmulator.h" +#include "Core/DSPEmulator.h" -#include "HW/DSPLLE/DSPLLE.h" -#include "HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPLLE/DSPLLE.h" DSPEmulator *CreateDSPEmulator(bool HLE) { diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h index caf90b0032..71a12635e8 100644 --- a/Source/Core/Core/DSPEmulator.h +++ b/Source/Core/Core/DSPEmulator.h @@ -4,8 +4,8 @@ #pragma once -#include "ChunkFile.h" -#include "SoundStream.h" +#include "AudioCommon/SoundStream.h" +#include "Common/ChunkFile.h" class DSPEmulator { diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index 3aa9294ef2..882284c5a9 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "StringUtil.h" -#include "Debugger_SymbolMap.h" -#include "../Core.h" -#include "../HW/Memmap.h" -#include "../PowerPC/PowerPC.h" -#include "../PowerPC/PPCAnalyst.h" -#include "../PowerPC/PPCSymbolDB.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" + +#include "Core/Core.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" namespace Dolphin_Debugger { diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index acf92f4243..0388024de9 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -4,10 +4,10 @@ #pragma once -#include #include +#include -#include "Common.h" +#include "Common/Common.h" namespace Dolphin_Debugger { diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp index bdd4f152d7..a4c23ab07d 100644 --- a/Source/Core/Core/Debugger/Dump.cpp +++ b/Source/Core/Core/Debugger/Dump.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include -#include "Common.h" -#include "Dump.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" + +#include "Core/Debugger/Dump.h" CDump::CDump(const char* _szFilename) : m_pData(NULL) diff --git a/Source/Core/Core/Debugger/Dump.h b/Source/Core/Core/Debugger/Dump.h index 70b6286aea..71c987f5e3 100644 --- a/Source/Core/Core/Debugger/Dump.h +++ b/Source/Core/Core/Debugger/Dump.h @@ -8,7 +8,7 @@ // #pragma once -#include "Common.h" +#include "Common/Common.h" class CDump { diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index 0fb1363f9c..25d344990c 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Debugger_SymbolMap.h" -#include "DebugInterface.h" -#include "PPCDebugInterface.h" #include "PowerPCDisasm.h" -#include "../Host.h" -#include "../Core.h" -#include "../HW/CPU.h" -#include "../HW/DSP.h" -#include "../HW/Memmap.h" -#include "../PowerPC/PowerPC.h" -#include "../PowerPC/JitCommon/JitBase.h" -#include "../PowerPC/PPCSymbolDB.h" + +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/JitCommon/JitBase.h" void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size) { diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h index 7b16f6bb77..a55de88a8f 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Debugger/PPCDebugInterface.h @@ -6,7 +6,7 @@ #include -#include "DebugInterface.h" +#include "Common/DebugInterface.h" //wrapper between disasm control and Dolphin debugger diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index e73ed3d891..7f641e9159 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -2,14 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FifoAnalyzer.h" +#include "Core/Core.h" +#include "Core/FifoPlayer/FifoAnalyzer.h" -#include "Core.h" - -#include "VertexLoader.h" -#include "VertexLoader_Position.h" -#include "VertexLoader_Normal.h" -#include "VertexLoader_TextCoord.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_Normal.h" +#include "VideoCommon/VertexLoader_Position.h" +#include "VideoCommon/VertexLoader_TextCoord.h" namespace FifoAnalyzer { diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h index a4c696f7d7..7953cf61f5 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h @@ -4,10 +4,10 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" -#include "BPMemory.h" -#include "CPMemory.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CPMemory.h" namespace FifoAnalyzer { diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index 5e7e864ad0..d4b66342a9 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FifoDataFile.h" -#include "FifoFileStruct.h" +#include "Common/FileUtil.h" -#include "FileUtil.h" +#include "Core/FifoPlayer/FifoDataFile.h" +#include "Core/FifoPlayer/FifoFileStruct.h" using namespace FifoFileStruct; using namespace std; diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h index 6d35ea094f..f1d4ace8c3 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h @@ -4,9 +4,10 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" + namespace File { class IOFile; diff --git a/Source/Core/Core/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/FifoPlayer/FifoFileStruct.h index daa4f41f80..928a2d5bfc 100644 --- a/Source/Core/Core/FifoPlayer/FifoFileStruct.h +++ b/Source/Core/Core/FifoPlayer/FifoFileStruct.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace FifoFileStruct { diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp index 81a647286c..e389f77311 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FifoAnalyzer.h" -#include "FifoDataFile.h" -#include "FifoPlaybackAnalyzer.h" +#include "Common/Common.h" -#include "Common.h" +#include "Core/FifoPlayer/FifoAnalyzer.h" +#include "Core/FifoPlayer/FifoDataFile.h" +#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" -#include "OpcodeDecoding.h" -#include "TextureDecoder.h" -#include "VertexLoader.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VertexLoader.h" using namespace std; using namespace FifoAnalyzer; diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h index 0db01cea82..fd85274ebd 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h @@ -4,12 +4,12 @@ #pragma once -#include "FifoAnalyzer.h" -#include "FifoDataFile.h" - #include #include +#include "Core/FifoPlayer/FifoAnalyzer.h" +#include "Core/FifoPlayer/FifoDataFile.h" + struct AnalyzedFrameInfo { std::vector objectStarts; diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 070f4792e3..55731f3162 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -2,21 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FifoDataFile.h" -#include "FifoPlayer.h" +#include "Common/Common.h" -#include "Common.h" -#include "ConfigManager.h" -#include "Core.h" -#include "CoreTiming.h" -#include "Host.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Host.h" +#include "Core/FifoPlayer/FifoDataFile.h" +#include "Core/FifoPlayer/FifoPlayer.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/SystemTimers.h" +#include "Core/PowerPC/PowerPC.h" -#include "HW/GPFifo.h" -#include "HW/Memmap.h" -#include "HW/SystemTimers.h" -#include "PowerPC/PowerPC.h" - -#include "BPMemory.h" +#include "VideoCommon/BPMemory.h" FifoPlayer::~FifoPlayer() { diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h index c6e3318d23..3ed2547432 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h @@ -4,10 +4,11 @@ #pragma once -#include "FifoPlaybackAnalyzer.h" #include #include +#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" + class FifoDataFile; struct MemoryUpdate; struct AnalyzedFrameInfo; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index d628e9bfbf..7e16ddb3de 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FifoAnalyzer.h" -#include "FifoRecordAnalyzer.h" -#include "FifoRecorder.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 "Core.h" -#include "HW/Memmap.h" - -#include "OpcodeDecoding.h" -#include "TextureDecoder.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/TextureDecoder.h" using namespace FifoAnalyzer; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index 06edc81114..bc9a27b870 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -4,11 +4,11 @@ #pragma once -#include "FifoAnalyzer.h" +#include "Common/Common.h" -#include "Common.h" +#include "Core/FifoPlayer/FifoAnalyzer.h" -#include "BPMemory.h" +#include "VideoCommon/BPMemory.h" class FifoRecordAnalyzer { diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index e58b34658a..7207812044 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ConfigManager.h" -#include "Core.h" -#include "FifoRecorder.h" -#include "Thread.h" -#include "HW/Memmap.h" +#include "Common/Thread.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/FifoPlayer/FifoRecorder.h" +#include "Core/HW/Memmap.h" static FifoRecorder instance; static std::recursive_mutex sMutex; diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h index 4cee4191e4..2b7bc0dfb2 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h @@ -4,8 +4,8 @@ #pragma once -#include "FifoDataFile.h" -#include "FifoRecordAnalyzer.h" +#include "Core/FifoPlayer/FifoDataFile.h" +#include "Core/FifoPlayer/FifoRecordAnalyzer.h" class FifoRecorder { diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 54a92fa6d3..310704a79a 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -2,16 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GeckoCode.h" - -#include "Thread.h" -#include "HW/Memmap.h" -#include "ConfigManager.h" -#include "PowerPC/PowerPC.h" -#include "CommonPaths.h" - #include +#include "Common/CommonPaths.h" +#include "Common/Thread.h" + +#include "Core/ConfigManager.h" +#include "Core/GeckoCode.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" + namespace Gecko { // return true if a code exists diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index 47f59fe1ee..d91e3212d2 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -4,11 +4,11 @@ #pragma once -#include "Common.h" - -#include -#include #include +#include +#include + +#include "Common/Common.h" namespace Gecko { diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index b434561230..6d41d2b3fa 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GeckoCodeConfig.h" - -#include "StringUtil.h" - -#include -#include #include +#include +#include + +#include "Common/StringUtil.h" + +#include "Core/GeckoCodeConfig.h" namespace Gecko { diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h index 2878650009..6131dacaee 100644 --- a/Source/Core/Core/GeckoCodeConfig.h +++ b/Source/Core/Core/GeckoCodeConfig.h @@ -4,9 +4,9 @@ #pragma once -#include "GeckoCode.h" +#include "Common/IniFile.h" -#include "IniFile.h" +#include "Core/GeckoCode.h" namespace Gecko { diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index 986716990a..a8f540d223 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -2,20 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "HLE.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/HLE_Misc.h" +#include "Core/HLE/HLE_OS.h" +#include "Core/HW/Memmap.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" -#include "../PowerPC/PowerPC.h" -#include "../PowerPC/PPCSymbolDB.h" -#include "../HW/Memmap.h" -#include "../Debugger/Debugger_SymbolMap.h" - -#include "HLE_OS.h" -#include "HLE_Misc.h" -#include "IPC_HLE/WII_IPC_HLE_Device_es.h" -#include "ConfigManager.h" -#include "Core.h" namespace HLE { diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h index 6deea0117e..f320ff3023 100644 --- a/Source/Core/Core/HLE/HLE.h +++ b/Source/Core/Core/HLE/HLE.h @@ -5,7 +5,8 @@ #pragma once #include -#include "CommonTypes.h" + +#include "Common/CommonTypes.h" namespace HLE { diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index 9b8754daf7..cb5070260e 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -3,25 +3,28 @@ // Refer to the license.txt file included. #include -#include "Common.h" -#include "HLE_OS.h" -#include "../PowerPC/PowerPC.h" -#include "../HW/Memmap.h" -#include "../Host.h" -#include "IPC_HLE/WII_IPC_HLE_Device_DI.h" -#include "ConfigManager.h" -#include "VolumeCreator.h" -#include "Filesystem.h" -#include "../Boot/Boot_DOL.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "HLE.h" -#include "PowerPC/PPCAnalyst.h" -#include "PowerPC/PPCCache.h" -#include "PowerPC/SignatureDB.h" -#include "PowerPC/PPCSymbolDB.h" -#include "CommonPaths.h" -#include "TextureCacheBase.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" + +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/HLE_OS.h" +#include "Core/HW/Memmap.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCCache.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/SignatureDB.h" + +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" + +#include "VideoCommon/TextureCacheBase.h" namespace HLE_Misc { diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index ed02672110..d4bf99820c 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "StringUtil.h" #include -#include "Common.h" -#include "HLE_OS.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" -#include "../PowerPC/PowerPC.h" -#include "../HW/Memmap.h" +#include "Core/HLE/HLE_OS.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" namespace HLE_OS { diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h index c55f27f456..f0d0af2815 100644 --- a/Source/Core/Core/HLE/HLE_OS.h +++ b/Source/Core/Core/HLE/HLE_OS.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace HLE_OS { diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp index 1de543470b..1512dba200 100644 --- a/Source/Core/Core/HW/AudioInterface.cpp +++ b/Source/Core/Core/HW/AudioInterface.cpp @@ -50,19 +50,18 @@ This file mainly deals with the [Drive I/F], however [AIDFR] controls TODO maybe the files should be merged? */ -#include "Common.h" -#include "MathUtil.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" -#include "StreamADPCM.h" -#include "AudioInterface.h" - -#include "CPU.h" -#include "ProcessorInterface.h" -#include "DVDInterface.h" -#include "../PowerPC/PowerPC.h" -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "MMIO.h" +#include "Core/CoreTiming.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/StreamADPCM.h" +#include "Core/HW/SystemTimers.h" +#include "Core/PowerPC/PowerPC.h" namespace AudioInterface { diff --git a/Source/Core/Core/HW/AudioInterface.h b/Source/Core/Core/HW/AudioInterface.h index e79d1c3fc7..404f14dec3 100644 --- a/Source/Core/Core/HW/AudioInterface.h +++ b/Source/Core/Core/HW/AudioInterface.h @@ -6,7 +6,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp index 5309d9fc6a..6d658121f2 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp @@ -1,22 +1,9 @@ -// Copyright (C) 2003-2009 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "../EXI_Device.h" -#include "../EXI_DeviceEthernet.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceEthernet.h" bool CEXIETHERNET::Activate() { diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp index 1140ef72e0..c81659eeed 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp @@ -1,23 +1,10 @@ -// Copyright (C) 2003-2009 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "StringUtil.h" -#include "../EXI_Device.h" -#include "../EXI_DeviceEthernet.h" +#include "Common/StringUtil.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceEthernet.h" #ifdef __linux__ #include diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp index c547038c88..4d8fc3c709 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "StringUtil.h" -// GROSS CODE ALERT: headers need to be included in the following order -#include "TAP_Win32.h" -#include "../EXI_Device.h" -#include "../EXI_DeviceEthernet.h" +#include "Common/StringUtil.h" + +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceEthernet.h" +#include "Core/HW/BBA-TAP/TAP_Win32.h" namespace Win32TAPHelper { diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h index 2a5bc52ffa..21cfcc71b8 100644 --- a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h +++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h @@ -31,8 +31,8 @@ // the TAP-Win32 driver and contains definitions // common to both. //=============================================== -#include #include +#include #include #define TAP_WIN32_MIN_MAJOR 9 #define TAP_WIN32_MIN_MINOR 0 diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index dc81955f13..5a2869425e 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "Thread.h" +#include "Common/Common.h" +#include "Common/Thread.h" -#include "../DSPEmulator.h" -#include "../PowerPC/PowerPC.h" -#include "../Host.h" -#include "../Core.h" -#include "CPU.h" -#include "DSP.h" -#include "Movie.h" +#include "Core/Core.h" +#include "Core/DSPEmulator.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/PowerPC/PowerPC.h" -#include "VideoBackendBase.h" +#include "VideoCommon/VideoBackendBase.h" namespace { diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h index bba52b6bfc..cbdfa91dfa 100644 --- a/Source/Core/Core/HW/CPU.h +++ b/Source/Core/Core/HW/CPU.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace Common { class Event; diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index 76aa433b76..fe14e1e19b 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -23,19 +23,19 @@ // the just used buffer through the AXList (or whatever it might be called in // Nintendo games). -#include "DSP.h" +#include "Common/MemoryUtil.h" -#include "../CoreTiming.h" -#include "../Core.h" -#include "CPU.h" -#include "MemoryUtil.h" -#include "Memmap.h" -#include "MMIO.h" -#include "ProcessorInterface.h" -#include "AudioInterface.h" -#include "../PowerPC/PowerPC.h" -#include "../ConfigManager.h" -#include "../DSPEmulator.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/DSPEmulator.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/PowerPC.h" namespace DSP { diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h index 5d6b192538..2a9475a210 100644 --- a/Source/Core/Core/HW/DSP.h +++ b/Source/Core/Core/HW/DSP.h @@ -4,7 +4,8 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" + class PointerWrap; class DSPEmulator; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index 501bc2a0dd..17838c4428 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -4,19 +4,19 @@ #include -#include "ChunkFile.h" -#include "IniFile.h" -#include "HLEMixer.h" -#include "StringUtil.h" -#include "LogManager.h" -#include "IniFile.h" -#include "DSPHLE.h" -#include "UCodes/UCodes.h" -#include "../AudioInterface.h" -#include "ConfigManager.h" -#include "Core.h" -#include "HW/SystemTimers.h" -#include "HW/VideoInterface.h" +#include "Common/ChunkFile.h" +#include "Common/IniFile.h" +#include "Common/LogManager.h" +#include "Common/StringUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPHLE/HLEMixer.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" DSPHLE::DSPHLE() { diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index a5c784cb79..3a8df834a6 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -4,10 +4,11 @@ #pragma once -#include "AudioCommon.h" -#include "SoundStream.h" -#include "MailHandler.h" -#include "../../DSPEmulator.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/SoundStream.h" + +#include "Core/DSPEmulator.h" +#include "Core/HW/DSPHLE/MailHandler.h" class IUCode; diff --git a/Source/Core/Core/HW/DSPHLE/HLEMixer.cpp b/Source/Core/Core/HW/DSPHLE/HLEMixer.cpp index 3b4e53c735..d1d51c4c85 100644 --- a/Source/Core/Core/HW/DSPHLE/HLEMixer.cpp +++ b/Source/Core/Core/HW/DSPHLE/HLEMixer.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPHLE.h" -#include "HLEMixer.h" -#include "UCodes/UCodes.h" +#include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPHLE/HLEMixer.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" void HLEMixer::Premix(short *samples, unsigned int numSamples) { diff --git a/Source/Core/Core/HW/DSPHLE/HLEMixer.h b/Source/Core/Core/HW/DSPHLE/HLEMixer.h index 1e5c21d93e..135bfe97b8 100644 --- a/Source/Core/Core/HW/DSPHLE/HLEMixer.h +++ b/Source/Core/Core/HW/DSPHLE/HLEMixer.h @@ -4,8 +4,8 @@ #pragma once -#include "AudioCommon.h" -#include "Mixer.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/Mixer.h" class DSPHLE; diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp index bcbc696186..7ce13142ab 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MailHandler.h" +#include "Core/HW/DSPHLE/MailHandler.h" CMailHandler::CMailHandler() { diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.h b/Source/Core/Core/HW/DSPHLE/MailHandler.h index 94a98f8bfa..21b3747e61 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.h +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.h @@ -6,8 +6,8 @@ #include -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" class CMailHandler { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp index 45a8d55c89..7dd4f19baf 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UCode_AX.h" -#include "../../DSP.h" -#include "FileUtil.h" -#include "ConfigManager.h" -#include "MathUtil.h" +#include "Common/FileUtil.h" +#include "Common/MathUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX.h" #define AX_GC -#include "UCode_AX_Voice.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h" CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h index 53c9328dc4..ede8ef6aa3 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h @@ -12,8 +12,8 @@ #pragma once -#include "UCodes.h" -#include "UCode_AXStructs.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" // We can't directly use the mixer_control field from the PB because it does // not mean the same in all AX versions. The AX UCode converts the diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 573fb6e834..df4550ba12 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -1,19 +1,19 @@ // Copyright 2013 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. +// +#define AX_WII // Used in UCode_AX_Voice. -#include "MathUtil.h" -#include "StringUtil.h" +#include "AudioCommon/Mixer.h" +#include "Common/MathUtil.h" +#include "Common/StringUtil.h" -#include "../MailHandler.h" -#include "Mixer.h" +#include "Core/HW/DSPHLE/MailHandler.h" -#include "UCodes.h" -#include "UCode_AXStructs.h" -#include "UCode_AXWii.h" - -#define AX_WII -#include "UCode_AX_Voice.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h index a9fe80b46f..fcee1ea139 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -4,7 +4,7 @@ #pragma once -#include "UCode_AX.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX.h" class CUCode_AXWii : public CUCode_AX { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 575481b3fb..6f4c2a490c 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -12,13 +12,15 @@ #error UCode_AX_Voice.h included without specifying version #endif -#include "Common.h" -#include "MathUtil.h" -#include "UCode_AXStructs.h" -#include "../../DSP.h" - #include +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "Core/HW/DSP.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h" + #ifdef AX_GC # define PB_TYPE AXPB # define MAX_SAMPLES_PER_FRAME 32 diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp index bb0d858548..9708a90773 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../DSPHLE.h" -#include "UCodes.h" -#include "UCode_CARD.h" -#include "../../DSP.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h index 64031a104c..5743e5f0fa 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h @@ -4,7 +4,7 @@ #pragma once -#include "UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" class CUCode_CARD : public IUCode { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp index 6490dd9c66..e9dd1da116 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp @@ -2,11 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UCodes.h" -#include "UCode_GBA.h" - -#include "../../DSP.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc) : IUCode(dsp_hle, crc) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h index 61e68a916b..db0e9a7671 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h @@ -4,7 +4,7 @@ #pragma once -#include "UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" struct CUCode_GBA : public IUCode { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp index 1d54f7075c..840d284e27 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UCodes.h" -#include "UCode_InitAudioSystem.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc) : IUCode(dsp_hle, crc) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h index 6d18114b28..1515f09cb9 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h @@ -4,7 +4,7 @@ #pragma once -#include "UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" class CUCode_InitAudioSystem : public IUCode { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp index 2b63bcf29c..1a905978a6 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp @@ -6,11 +6,12 @@ #include #endif -#include "UCodes.h" -#include "UCode_ROM.h" -#include "Hash.h" -#include "../../Memmap.h" -#include "ConfigManager.h" +#include "Common/Hash.h" + +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc) : IUCode(dsp_hle, crc) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h index 51d5fec866..96983e7bc5 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h @@ -4,7 +4,7 @@ #pragma once -#include "UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" class CUCode_Rom : public IUCode { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp index 0490206842..7c8536ccc0 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp @@ -6,15 +6,14 @@ // Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess, // Super Mario Galaxy -#include "UCodes.h" -#include "UCode_Zelda.h" -#include "../MailHandler.h" +#include "AudioCommon/Mixer.h" +#include "AudioCommon/WaveFile.h" -#include "Mixer.h" - -#include "WaveFile.h" -#include "../../DSP.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DSPHLE/MailHandler.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h index 11227d4c67..eab6de743f 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "UCodes.h" +#include "Common/Common.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" // Obviously missing things that must be in here, somewhere among the "unknown": // * Volume diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp index 2f9d03e9b0..5c28a7ff41 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "MathUtil.h" -#include "UCode_Zelda.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h" void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed short *out, short *histp, short *hist2p, int type) { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp index 261ff64d8e..1ae76d2af8 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include -#include "UCodes.h" -#include "UCode_Zelda.h" -#include "AudioCommon.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/Mixer.h" -#include "Mixer.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size) { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp index bf9a0cd3f7..bd503baebd 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -4,14 +4,14 @@ #include -#include "UCodes.h" -#include "UCode_Zelda.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/Mixer.h" +#include "Common/MathUtil.h" -#include "AudioCommon.h" -#include "MathUtil.h" -#include "Mixer.h" -#include "../../Memmap.h" -#include "../../DSP.h" +#include "Core/HW/DSP.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" void CUCode_Zelda::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB) { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index 403d95c1b6..4dad9783b0 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -6,16 +6,16 @@ #include #endif -#include "UCodes.h" +#include "Common/Hash.h" -#include "UCode_AX.h" -#include "UCode_AXWii.h" -#include "UCode_Zelda.h" -#include "UCode_ROM.h" -#include "UCode_CARD.h" -#include "UCode_InitAudioSystem.h" -#include "UCode_GBA.h" -#include "Hash.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h" +#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h" +#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h" +#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h" +#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h index f462674156..73bf8795fb 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -4,12 +4,12 @@ #pragma once -#include "Common.h" -#include "ChunkFile.h" -#include "Thread.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/Thread.h" -#include "../DSPHLE.h" -#include "../../Memmap.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/DSPHLE/DSPHLE.h" #define UCODE_ROM 0x00000000 #define UCODE_INIT_AUDIO_SYSTEM 0x00000001 diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp index 9343fa7089..a6dd80ae1b 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp @@ -2,13 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPDebugInterface.h" - -#include "DSP/DSPCore.h" -#include "DSP/disassemble.h" - -#include "DSPSymbols.h" -#include "DSP/DSPMemoryMap.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/HW/DSPLLE/DSPDebugInterface.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" void DSPDebugInterface::disasm(unsigned int address, char *dest, int max_size) { diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h index 1eca065104..608bd3c5e1 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h @@ -7,8 +7,8 @@ #include #include -#include "DebugInterface.h" -#include "Common.h" +#include "Common/Common.h" +#include "Common/DebugInterface.h" class DSPDebugInterface : public DebugInterface { diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index 5b2dc1f56e..cf49032fe1 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -2,18 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "Hash.h" -#include "DSP/DSPAnalyzer.h" -#include "DSP/DSPCore.h" -#include "DSP/DSPHost.h" -#include "DSPSymbols.h" -#include "DSPLLETools.h" -#include "../DSP.h" -#include "../../ConfigManager.h" -#include "../../PowerPC/PowerPC.h" -#include "Host.h" -#include "OnScreenDisplay.h" +#include "Common/Common.h" +#include "Common/Hash.h" + +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHost.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DSPLLE/DSPLLETools.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" +#include "Core/PowerPC/PowerPC.h" +#include "VideoCommon/OnScreenDisplay.h" // The user of the DSPCore library must supply a few functions so that the // emulation core can access the environment it runs in. If the emulation diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index af747815d1..7f9a926352 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -2,38 +2,37 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/Mixer.h" -#include "Common.h" -#include "CommonPaths.h" -#include "Atomic.h" -#include "CommonTypes.h" -#include "LogManager.h" -#include "Thread.h" -#include "ChunkFile.h" -#include "IniFile.h" -#include "ConfigManager.h" -#include "CPUDetect.h" -#include "Core.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/CPUDetect.h" +#include "Common/IniFile.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" -#include "DSPLLEGlobals.h" // Local -#include "DSP/DSPHost.h" -#include "DSP/DSPInterpreter.h" -#include "DSP/DSPHWInterface.h" -#include "DSP/disassemble.h" -#include "DSPSymbols.h" -#include "Host.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHost.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPTables.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/Memmap.h" -#include "AudioCommon.h" -#include "Mixer.h" - -#include "DSP/DSPTables.h" -#include "DSP/DSPCore.h" -#include "DSPLLE.h" -#include "../Memmap.h" -#include "../AudioInterface.h" +#include "Core/HW/DSPLLE/DSPLLE.h" +#include "Core/HW/DSPLLE/DSPLLEGlobals.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" -DSPLLE::DSPLLE() { +DSPLLE::DSPLLE() +{ soundStream = NULL; m_InitMixer = false; m_bIsRunning = false; diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 7197d8f69e..adb332661d 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -4,10 +4,11 @@ #pragma once -#include "Thread.h" -#include "SoundStream.h" -#include "DSPLLEGlobals.h" // Local -#include "../../DSPEmulator.h" +#include "AudioCommon/SoundStream.h" +#include "Common/Thread.h" + +#include "Core/DSPEmulator.h" +#include "Core/HW/DSPLLE/DSPLLEGlobals.h" class DSPLLE : public DSPEmulator { diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp index c879f5604b..d41db0a0ba 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" // for Common::swap -#include "FileUtil.h" -#include "DSP/DSPCore.h" -#include "DSPLLEGlobals.h" #include +#include "Common/Common.h" +#include "Common/FileUtil.h" + +#include "Core/DSP/DSPCore.h" +#include "Core/HW/DSPLLE/DSPLLEGlobals.h" + #if PROFILE #define PROFILE_MAP_SIZE 0x10000 diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h index 7d21a3d1ec..eb903db115 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "AudioCommon.h" +#include "AudioCommon/AudioCommon.h" +#include "Common/Common.h" // TODO: Get rid of this file. diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp index d0f50834a2..1d9c0e8d4f 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp @@ -6,18 +6,18 @@ #include #endif -#include -#include +#include +#include -#include "Common.h" -#include "DSPLLEGlobals.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" -#include "FileUtil.h" -#include "DSP/DSPCore.h" -#include "DSP/DSPCodeUtil.h" -#include "DSPLLETools.h" -#include "DSP/disassemble.h" -#include "DSP/DSPInterpreter.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPCodeUtil.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/HW/DSPLLE/DSPLLEGlobals.h" +#include "Core/HW/DSPLLE/DSPLLETools.h" bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc) { diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp index 90beaed796..0933635eee 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp @@ -6,13 +6,13 @@ #include #include -#include "Common.h" -#include "StringUtil.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" -#include "DSP/DSPCore.h" -#include "DSPSymbols.h" -#include "DSP/disassemble.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPCore.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" namespace DSPSymbols { diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h index 1939731796..acf646b9f4 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "SymbolDB.h" +#include "Common/Common.h" +#include "Common/SymbolDB.h" namespace DSPSymbols { diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 884b5c3941..b69efec145 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -2,22 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" // Common -#include "ChunkFile.h" -#include "../ConfigManager.h" -#include "../CoreTiming.h" -#include "SystemTimers.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/Thread.h" -#include "StreamADPCM.h" // Core -#include "DVDInterface.h" -#include "../PowerPC/PowerPC.h" -#include "ProcessorInterface.h" -#include "Thread.h" -#include "Memmap.h" -#include "../VolumeHandler.h" -#include "AudioInterface.h" -#include "../Movie.h" -#include "MMIO.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/StreamADPCM.h" +#include "Core/HW/SystemTimers.h" +#include "Core/PowerPC/PowerPC.h" // Disc transfer rate measured in bytes per second static const u32 DISC_TRANSFER_RATE_GC = 5 * 1024 * 1024; diff --git a/Source/Core/Core/HW/DVDInterface.h b/Source/Core/Core/HW/DVDInterface.h index ede1dc6bdc..2eaf3b2ffc 100644 --- a/Source/Core/Core/HW/DVDInterface.h +++ b/Source/Core/Core/HW/DVDInterface.h @@ -4,7 +4,8 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" + class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index dfa0b9da10..b5492ac3be 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ChunkFile.h" -#include "../ConfigManager.h" -#include "../CoreTiming.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "ProcessorInterface.h" -#include "../PowerPC/PowerPC.h" -#include "MMIO.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/Sram.h" +#include "Core/PowerPC/PowerPC.h" -#include "EXI.h" -#include "Sram.h" -#include "../Movie.h" SRAM g_SRAM; namespace ExpansionInterface diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI.h index f35ed1a191..7e0d2df0fc 100644 --- a/Source/Core/Core/HW/EXI.h +++ b/Source/Core/Core/HW/EXI.h @@ -4,9 +4,11 @@ #pragma once -#include "CommonTypes.h" -#include "EXI_Channel.h" -#include "Thread.h" +#include "Common/CommonTypes.h" +#include "Common/Thread.h" + +#include "Core/HW/EXI_Channel.h" + class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/EXI_Channel.cpp b/Source/Core/Core/HW/EXI_Channel.cpp index ae91ebe2cd..902f50e7d4 100644 --- a/Source/Core/Core/HW/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI_Channel.cpp @@ -2,21 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "EXI_Channel.h" -#include "EXI_Device.h" -#include "EXI.h" -#include "../ConfigManager.h" -#include "../Movie.h" -#include "MMIO.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI.h" +#include "Core/HW/EXI_Channel.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/PowerPC.h" #define EXI_READ 0 #define EXI_WRITE 1 #define EXI_READWRITE 2 -#include "ProcessorInterface.h" -#include "../PowerPC/PowerPC.h" -#include "CoreTiming.h" - CEXIChannel::CEXIChannel(u32 ChannelId) : m_DMAMemoryAddress(0), m_DMALength(0), diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h index aedc09c3ea..443b9202ac 100644 --- a/Source/Core/Core/HW/EXI_Channel.h +++ b/Source/Core/Core/HW/EXI_Channel.h @@ -4,11 +4,11 @@ #pragma once -#include "CommonTypes.h" - -#include "EXI_Device.h" #include +#include "Common/CommonTypes.h" +#include "Core/HW/EXI_Device.h" + namespace MMIO { class Mapping; } class CEXIChannel diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index e2e4924d38..86833c270d 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -2,19 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Memmap.h" -#include "EXI_Device.h" -#include "EXI_DeviceIPL.h" -#include "EXI_DeviceMemoryCard.h" -#include "EXI_DeviceAD16.h" -#include "EXI_DeviceMic.h" -#include "EXI_DeviceEthernet.h" -#include "EXI_DeviceAMBaseboard.h" -#include "EXI_DeviceGecko.h" - -#include "../Core.h" -#include "../ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceAD16.h" +#include "Core/HW/EXI_DeviceAMBaseboard.h" +#include "Core/HW/EXI_DeviceEthernet.h" +#include "Core/HW/EXI_DeviceGecko.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/EXI_DeviceMemoryCard.h" +#include "Core/HW/EXI_DeviceMic.h" +#include "Core/HW/Memmap.h" // --- interface IEXIDevice --- diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI_Device.h index f83f45d8d4..69a7761075 100644 --- a/Source/Core/Core/HW/EXI_Device.h +++ b/Source/Core/Core/HW/EXI_Device.h @@ -4,8 +4,8 @@ #pragma once -#include "CommonTypes.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" enum TEXIDevices { diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/HW/EXI_DeviceAD16.cpp index e4806b87da..6726c31c88 100644 --- a/Source/Core/Core/HW/EXI_DeviceAD16.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAD16.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../Core.h" +#include "Core/Core.h" -#include "EXI_Device.h" -#include "EXI_DeviceAD16.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceAD16.h" CEXIAD16::CEXIAD16() : m_uPosition(0), diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp index 03de8304f2..9975d148de 100644 --- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../Core.h" +#include "Core/Core.h" -#include "EXI_Device.h" -#include "EXI_DeviceAMBaseboard.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceAMBaseboard.h" CEXIAMBaseboard::CEXIAMBaseboard() : m_position(0) diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp index e780c8d6e7..d80f2bb886 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Memmap.h" -#include "EXI_Device.h" -#include "EXI_DeviceEthernet.h" -#include "StringUtil.h" -#include "../ConfigManager.h" +#include "Common/StringUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceEthernet.h" +#include "Core/HW/Memmap.h" // XXX: The BBA stores multi-byte elements as little endian. // Multiple parts of this implementation depend on dolphin diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h index 803e6f0ac9..182f6c28b3 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h @@ -8,7 +8,7 @@ #include #endif -#include "Thread.h" +#include "Common/Thread.h" // Network Control Register A enum NCRA diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp index 594c9c674a..2938d85cd4 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp @@ -4,9 +4,9 @@ #include -#include "EXI_Device.h" -#include "EXI_DeviceGecko.h" -#include "../Core.h" +#include "Core/Core.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceGecko.h" u16 GeckoSockServer::server_port; int GeckoSockServer::client_count; diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI_DeviceGecko.h index 9de1801f79..4a24c4d9bd 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.h +++ b/Source/Core/Core/HW/EXI_DeviceGecko.h @@ -4,12 +4,13 @@ #pragma once -#include "SFML/Network.hpp" -#include "Thread.h" - #include #include +#include + +#include "Common/Thread.h" + class GeckoSockServer : public sf::SocketTCP { diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index 716b04969b..d0409bd992 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" -#include "Timer.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/Timer.h" -#include "EXI_DeviceIPL.h" -#include "../Core.h" -#include "../ConfigManager.h" -#include "MemoryUtil.h" -#include "FileUtil.h" -#include "../Movie.h" -#include "../CoreTiming.h" -#include "SystemTimers.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/SystemTimers.h" // We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong) // so that people can change default language. diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index 2d0759f3ee..d127977547 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -4,8 +4,8 @@ #pragma once -#include "EXI_Device.h" -#include "Sram.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/Sram.h" class CEXIIPL : public IEXIDevice { diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp index fbf492e4d2..1b638b2d04 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FileUtil.h" -#include "StringUtil.h" -#include "../Core.h" -#include "../CoreTiming.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" -#include "../ConfigManager.h" -#include "../Movie.h" -#include "EXI.h" -#include "EXI_Device.h" -#include "EXI_DeviceMemoryCard.h" -#include "Sram.h" -#include "GCMemcard.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceMemoryCard.h" +#include "Core/HW/GCMemcard.h" +#include "Core/HW/Sram.h" #define MC_STATUS_BUSY 0x80 #define MC_STATUS_UNLOCKED 0x40 diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h index 070c519742..47f5ff40de 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h @@ -4,7 +4,7 @@ #pragma once -#include "Thread.h" +#include "Common/Thread.h" // Data structure to be passed to the flushing thread. struct FlushData diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp index 863463f41c..4d4268fd98 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp @@ -2,20 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" #if HAVE_PORTAUDIO -#include "../CoreTiming.h" -#include "SystemTimers.h" - -#include "EXI_Device.h" -#include "EXI_DeviceMic.h" +#include "Core/CoreTiming.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceMic.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/SystemTimers.h" #include -#include "GCPad.h" - void CEXIMic::StreamLog(const char *msg) { DEBUG_LOG(EXPANSIONINTERFACE, "%s: %s", diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h index 3ae9d60158..00cda0f20e 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/HW/EXI_DeviceMic.h @@ -6,7 +6,7 @@ #if HAVE_PORTAUDIO -#include "StdMutex.h" +#include "Common/StdMutex.h" class CEXIMic : public IEXIDevice { diff --git a/Source/Core/Core/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp index ec05e5043c..99fcd86c19 100644 --- a/Source/Core/Core/HW/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GCMemcard.h" -#include "ColorUtil.h" - #include +#include "Common/ColorUtil.h" +#include "Core/HW/GCMemcard.h" + static void ByteSwap(u8 *valueA, u8 *valueB) { u8 tmp = *valueA; diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index 08ca5cef4b..37a601daa2 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -4,11 +4,12 @@ #pragma once -#include "Common.h" -#include "CommonPaths.h" -#include "Sram.h" -#include "StringUtil.h" -#include "EXI_DeviceIPL.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/StringUtil.h" + +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/Sram.h" #define BE64(x) (Common::swap64(x)) #define BE32(x) (Common::swap32(x)) diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp index 1ba87e311c..8c17a3d4df 100644 --- a/Source/Core/Core/HW/GCPad.cpp +++ b/Source/Core/Core/HW/GCPad.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "GCPadStatus.h" +#include "Common/Common.h" -#include "ControllerInterface/ControllerInterface.h" -#include "GCPadEmu.h" -#include "../ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/GCPadEmu.h" + +#include "InputCommon/GCPadStatus.h" +#include "InputCommon/InputConfig.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "../../InputCommon/InputConfig.h" namespace Pad { diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h index e687208b4e..ee03c3cd51 100644 --- a/Source/Core/Core/HW/GCPad.h +++ b/Source/Core/Core/HW/GCPad.h @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonTypes.h" -#include "GCPadStatus.h" -#include "../InputCommon/InputConfig.h" +#include "Common/CommonTypes.h" +#include "InputCommon/GCPadStatus.h" +#include "InputCommon/InputConfig.h" #pragma once diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index 39d2ea29c5..ad24815916 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GCPadEmu.h" -#include "../Host.h" +#include "Core/Host.h" +#include "Core/HW/GCPadEmu.h" const u16 button_bitmasks[] = { diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h index 4fe96a6662..150ef15a27 100644 --- a/Source/Core/Core/HW/GCPadEmu.h +++ b/Source/Core/Core/HW/GCPadEmu.h @@ -6,7 +6,7 @@ #include -#include "ControllerEmu.h" +#include "InputCommon/ControllerEmu.h" class GCPad : public ControllerEmu { diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp index 88371a68d9..512fea8ab9 100644 --- a/Source/Core/Core/HW/GPFifo.cpp +++ b/Source/Core/Core/HW/GPFifo.cpp @@ -2,15 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ChunkFile.h" -#include "ProcessorInterface.h" -#include "Memmap.h" -#include "VideoBackendBase.h" -#include "../PowerPC/JitCommon/JitBase.h" -#include "../PowerPC/PowerPC.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "GPFifo.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitCommon/JitBase.h" + +#include "VideoCommon/VideoBackendBase.h" namespace GPFifo { diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 3a895a7bf8..6871d95186 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" class PointerWrap; namespace GPFifo diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index 63f934588a..acc78f1c0f 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -2,27 +2,28 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "../Core.h" -#include "HW.h" -#include "../PowerPC/PowerPC.h" -#include "CPU.h" -#include "DSP.h" -#include "DVDInterface.h" -#include "EXI.h" -#include "GPFifo.h" -#include "Memmap.h" -#include "ProcessorInterface.h" -#include "SI.h" -#include "AudioInterface.h" -#include "VideoInterface.h" -#include "WII_IPC.h" -#include "../ConfigManager.h" -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "../IPC_HLE/WII_IPC_HLE.h" -#include "../State.h" -#include "../PowerPC/PPCAnalyst.h" +#include "Common/Common.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/State.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/EXI.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/HW.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/HW/WII_IPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" namespace HW { diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h index 3ce3bab320..c01ec7b52d 100644 --- a/Source/Core/Core/HW/HW.h +++ b/Source/Core/Core/HW/HW.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" namespace HW { diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index 759823f480..2f8788b214 100644 --- a/Source/Core/Core/HW/MMIO.cpp +++ b/Source/Core/Core/HW/MMIO.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MMIO.h" -#include "MMIOHandlers.h" - #include +#include "Core/HW/MMIO.h" +#include "Core/HW/MMIOHandlers.h" + namespace MMIO { diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h index 35f83d8b99..541d75b271 100644 --- a/Source/Core/Core/HW/MMIO.h +++ b/Source/Core/Core/HW/MMIO.h @@ -4,12 +4,12 @@ #pragma once -#include "Common.h" #include #include #include -#include "MMIOHandlers.h" +#include "Common/Common.h" +#include "Core/HW/MMIOHandlers.h" namespace MMIO { diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h index 732704efae..b0f41a4fef 100644 --- a/Source/Core/Core/HW/MMIOHandlers.h +++ b/Source/Core/Core/HW/MMIOHandlers.h @@ -4,11 +4,11 @@ #pragma once -#include "Common.h" - #include #include +#include "Common/Common.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 // (including the declaration of the public functions for creating handling diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index 2d0568521d..ca57d24f44 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -8,32 +8,32 @@ // However, if a JITed instruction (for example lwz) wants to access a bad memory area that call // may be redirected here (for example to Read_U32()). +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/MemArena.h" +#include "Common/MemoryUtil.h" -#include "Common.h" -#include "MemoryUtil.h" -#include "MemArena.h" -#include "ChunkFile.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/EXI.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MemoryInterface.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/VideoInterface.h" +#include "Core/HW/WII_IPC.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitCommon/JitBase.h" -#include "Memmap.h" -#include "../Core.h" -#include "../PowerPC/PowerPC.h" -#include "../PowerPC/JitCommon/JitBase.h" -#include "../HLE/HLE.h" -#include "CPU.h" -#include "ProcessorInterface.h" -#include "DSP.h" -#include "DVDInterface.h" -#include "GPFifo.h" -#include "VideoInterface.h" -#include "SI.h" -#include "EXI.h" -#include "AudioInterface.h" -#include "MemoryInterface.h" -#include "WII_IPC.h" -#include "../ConfigManager.h" -#include "../Debugger/Debugger_SymbolMap.h" -#include "VideoBackendBase.h" -#include "MMIO.h" +#include "VideoCommon/VideoBackendBase.h" namespace Memory { diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index 77599fbf3d..85c2a363d4 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -17,9 +17,9 @@ #pragma once -// Includes #include -#include "Common.h" + +#include "Common/Common.h" // Enable memory checks in the Debug/DebugFast builds, but NOT in release #if defined(_DEBUG) || defined(DEBUGFAST) diff --git a/Source/Core/Core/HW/MemmapFunctions.cpp b/Source/Core/Core/HW/MemmapFunctions.cpp index 6168d91bc3..3a85a1ed70 100644 --- a/Source/Core/Core/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/HW/MemmapFunctions.cpp @@ -15,18 +15,19 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" -#include "Atomic.h" +#include "Common/Atomic.h" +#include "Common/Common.h" -#include "GPFifo.h" -#include "Memmap.h" -#include "../Core.h" -#include "../PowerPC/PowerPC.h" -#include "VideoBackendBase.h" -#include "MMIO.h" +#include "Core/Core.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" #ifdef USE_GDBSTUB -#include "../PowerPC/GDBStub.h" +#include "Core/PowerPC/GDBStub.h" #endif namespace Memory diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp index ed38f07d64..e3fae0cb7e 100644 --- a/Source/Core/Core/HW/MemoryInterface.cpp +++ b/Source/Core/Core/HW/MemoryInterface.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "../PowerPC/PowerPC.h" -#include "MemoryInterface.h" -#include "MMIO.h" +#include "Core/HW/MemoryInterface.h" +#include "Core/HW/MMIO.h" +#include "Core/PowerPC/PowerPC.h" namespace MemoryInterface { diff --git a/Source/Core/Core/HW/MemoryInterface.h b/Source/Core/Core/HW/MemoryInterface.h index 436d822207..3d4891f972 100644 --- a/Source/Core/Core/HW/MemoryInterface.h +++ b/Source/Core/Core/HW/MemoryInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace MMIO { class Mapping; } class PointerWrap; diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index 7b8e4778b0..52547fd745 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -2,19 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include -#include "Common.h" -#include "Atomic.h" -#include "ChunkFile.h" -#include "../PowerPC/PowerPC.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "CPU.h" -#include "../CoreTiming.h" -#include "ProcessorInterface.h" -#include "GPFifo.h" -#include "VideoBackendBase.h" -#include "MMIO.h" +#include "Core/CoreTiming.h" +#include "Core/HW/CPU.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" namespace ProcessorInterface { diff --git a/Source/Core/Core/HW/ProcessorInterface.h b/Source/Core/Core/HW/ProcessorInterface.h index c0c4507496..e2fe43c390 100644 --- a/Source/Core/Core/HW/ProcessorInterface.h +++ b/Source/Core/Core/HW/ProcessorInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp index f3ec409d04..6c7d98387d 100644 --- a/Source/Core/Core/HW/SI.cpp +++ b/Source/Core/Core/HW/SI.cpp @@ -2,20 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ChunkFile.h" -#include "../ConfigManager.h" -#include "../CoreTiming.h" -#include "../Movie.h" -#include "../NetPlayProto.h" -#include "MMIO.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "SystemTimers.h" -#include "ProcessorInterface.h" -#include "VideoInterface.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_DeviceGBA.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" -#include "SI.h" -#include "SI_DeviceGBA.h" namespace SerialInterface { diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h index 1af21c6ed8..4d14f7603c 100644 --- a/Source/Core/Core/HW/SI.h +++ b/Source/Core/Core/HW/SI.h @@ -4,8 +4,9 @@ #pragma once -#include "Common.h" -#include "SI_Device.h" +#include "Common/Common.h" +#include "Core/HW/SI_Device.h" + class PointerWrap; class ISIDevice; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI_Device.cpp index ee0e649b5e..01a173b658 100644 --- a/Source/Core/Core/HW/SI_Device.cpp +++ b/Source/Core/Core/HW/SI_Device.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI_Device.h" -#include "SI_DeviceGCController.h" -#include "SI_DeviceGCSteeringWheel.h" -#include "SI_DeviceDanceMat.h" -#include "SI_DeviceGBA.h" -#include "SI_DeviceAMBaseboard.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceAMBaseboard.h" +#include "Core/HW/SI_DeviceDanceMat.h" +#include "Core/HW/SI_DeviceGBA.h" +#include "Core/HW/SI_DeviceGCController.h" +#include "Core/HW/SI_DeviceGCSteeringWheel.h" // --- interface ISIDevice --- diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h index a0912988e1..5c819dccc2 100644 --- a/Source/Core/Core/HW/SI_Device.h +++ b/Source/Core/Core/HW/SI_Device.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" class PointerWrap; diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp index 96d3fba56c..4729d3a678 100644 --- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Core/HW/GCPad.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceAMBaseboard.h" -#include "SI.h" -#include "SI_Device.h" -#include "SI_DeviceAMBaseboard.h" - -#include "GCPadStatus.h" -#include "GCPad.h" +#include "InputCommon/GCPadStatus.h" // where to put baseboard debug #define AMBASEBOARDDEBUG OSREPORT diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp index 20dbd3ff61..40405b60e3 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp @@ -2,21 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI.h" -#include "SI_Device.h" -#include "SI_DeviceDanceMat.h" - -#include "EXI_Device.h" -#include "EXI_DeviceMic.h" - -#include "GCPad.h" - -#include "../Movie.h" - -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "ProcessorInterface.h" -#include "../Core.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceMic.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceDanceMat.h" +#include "Core/HW/SystemTimers.h" // --- Dance mat gamecube controller --- CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h index 6fd73c3c64..2185d84775 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h @@ -4,9 +4,8 @@ #pragma once -#include "SI_Device.h" -#include "GCPadStatus.h" - +#include "Core/HW/SI_Device.h" +#include "InputCommon/GCPadStatus.h" // standard gamecube controller class CSIDevice_DanceMat : public ISIDevice diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp index 754c17d376..93a73650bb 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI_Device.h" -#include "SI_DeviceGBA.h" +#include + +#include "Common/Thread.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceGBA.h" #include "SFML/Network.hpp" -#include "Thread.h" -#include static std::thread connectionThread; static std::queue waiting_socks; diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI_DeviceGCController.cpp index a6ddab1f03..09129f9fe6 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCController.cpp @@ -2,21 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI.h" -#include "SI_Device.h" -#include "SI_DeviceGCController.h" - -#include "EXI_Device.h" -#include "EXI_DeviceMic.h" - -#include "GCPad.h" - -#include "../Movie.h" - -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "ProcessorInterface.h" -#include "../Core.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceMic.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceGCController.h" +#include "Core/HW/SystemTimers.h" // --- standard gamecube controller --- CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI_DeviceGCController.h index e5b1405fc4..9c0082266b 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/HW/SI_DeviceGCController.h @@ -4,8 +4,8 @@ #pragma once -#include "SI_Device.h" -#include "GCPadStatus.h" +#include "Core/HW/SI_Device.h" +#include "InputCommon/GCPadStatus.h" // standard gamecube controller diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp index 33937dccca..3eb43083dc 100644 --- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp @@ -2,21 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI.h" -#include "SI_Device.h" -#include "SI_DeviceGCSteeringWheel.h" -#include "EXI_Device.h" -#include "EXI_DeviceMic.h" - -#include "GCPad.h" - -#include "../Movie.h" - -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "ProcessorInterface.h" -#include "../Core.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceMic.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceGCSteeringWheel.h" +#include "Core/HW/SystemTimers.h" // --- standard gamecube controller --- CSIDevice_GCSteeringWheel::CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h index 2a677288ba..78757d20d0 100644 --- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h @@ -4,9 +4,8 @@ #pragma once -#include "SI_Device.h" -#include "GCPadStatus.h" - +#include "Core/HW/SI_Device.h" +#include "InputCommon/GCPadStatus.h" // standard gamecube controller class CSIDevice_GCSteeringWheel : public ISIDevice diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp index 368d2b3a97..e1368be08d 100644 --- a/Source/Core/Core/HW/Sram.cpp +++ b/Source/Core/Core/HW/Sram.cpp @@ -2,8 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Sram.h" -#include "../ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/HW/Sram.h" + // english SRAM sram_dump = {{ 0x04, 0x6B, diff --git a/Source/Core/Core/HW/Sram.h b/Source/Core/Core/HW/Sram.h index 9a84212c3c..da71b62b0e 100644 --- a/Source/Core/Core/HW/Sram.h +++ b/Source/Core/Core/HW/Sram.h @@ -35,7 +35,7 @@ distribution. -------------------------------------------------------------*/ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" #pragma pack(push,1) union SRAM diff --git a/Source/Core/Core/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp index 4dc910948d..e0412670df 100644 --- a/Source/Core/Core/HW/StreamADPCM.cpp +++ b/Source/Core/Core/HW/StreamADPCM.cpp @@ -4,8 +4,8 @@ // Adapted from in_cube by hcs & destop -#include "StreamADPCM.h" -#include "MathUtil.h" +#include "Common/MathUtil.h" +#include "Core/HW/StreamADPCM.h" // STATE_TO_SAVE (not saved yet!) static s32 histl1; diff --git a/Source/Core/Core/HW/StreamADPCM.h b/Source/Core/Core/HW/StreamADPCM.h index 5a1f836d9d..14384b073e 100644 --- a/Source/Core/Core/HW/StreamADPCM.h +++ b/Source/Core/Core/HW/StreamADPCM.h @@ -6,7 +6,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" class NGCADPCM { diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 27683d1214..4e51ba8585 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -56,26 +56,27 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: CWII_IPC_HLE_WiiMote::Update() */ +#include "Common/Atomic.h" +#include "Common/Common.h" +#include "Common/Thread.h" +#include "Common/Timer.h" -#include "Common.h" -#include "Atomic.h" -#include "../PatchEngine.h" -#include "SystemTimers.h" -#include "DSP.h" -#include "AudioInterface.h" -#include "VideoInterface.h" -#include "SI.h" -#include "EXI_DeviceIPL.h" -#include "../PowerPC/PowerPC.h" -#include "../CoreTiming.h" -#include "../ConfigManager.h" -#include "../IPC_HLE/WII_IPC_HLE.h" -#include "../DSPEmulator.h" -#include "Thread.h" -#include "Timer.h" -#include "VideoBackendBase.h" -#include "CommandProcessor.h" -#include "Host.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/DSPEmulator.h" +#include "Core/Host.h" +#include "Core/PatchEngine.h" +#include "Core/HW/AudioInterface.h" +#include "Core/HW/DSP.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/SI.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/VideoBackendBase.h" namespace SystemTimers diff --git a/Source/Core/Core/HW/SystemTimers.h b/Source/Core/Core/HW/SystemTimers.h index ff7e59f530..d4b2073ac3 100644 --- a/Source/Core/Core/HW/SystemTimers.h +++ b/Source/Core/Core/HW/SystemTimers.h @@ -17,7 +17,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" namespace SystemTimers { diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 66f0d70517..d4807fc7f1 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -2,21 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" -#include "../PowerPC/PowerPC.h" -#include "../Core.h" -#include "ProcessorInterface.h" -#include "VideoInterface.h" -#include "Memmap.h" -#include "../CoreTiming.h" -#include "SystemTimers.h" -#include "StringUtil.h" -#include "MMIO.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/State.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/PowerPC/PowerPC.h" -#include "VideoBackendBase.h" -#include "State.h" +#include "VideoCommon/VideoBackendBase.h" namespace VideoInterface { diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h index dc4a3c248c..ff4a5c2b10 100644 --- a/Source/Core/Core/HW/VideoInterface.h +++ b/Source/Core/Core/HW/VideoInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp index 04bd936d43..93ff9bbade 100644 --- a/Source/Core/Core/HW/WII_IPC.cpp +++ b/Source/Core/Core/HW/WII_IPC.cpp @@ -6,17 +6,16 @@ #include #include -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "CPU.h" -#include "Memmap.h" -#include "ProcessorInterface.h" -#include "MMIO.h" - -#include "../IPC_HLE/WII_IPC_HLE.h" -#include "WII_IPC.h" -#include "CoreTiming.h" +#include "Core/CoreTiming.h" +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/WII_IPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" // This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because of the IOS HLE diff --git a/Source/Core/Core/HW/WII_IPC.h b/Source/Core/Core/HW/WII_IPC.h index ce7119eb4c..7cb578b31b 100644 --- a/Source/Core/Core/HW/WII_IPC.h +++ b/Source/Core/Core/HW/WII_IPC.h @@ -4,7 +4,8 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" + class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index 5efd075e0d..f93aa1c9e8 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -2,17 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "Wiimote.h" -#include "WiimoteReal/WiimoteReal.h" -#include "WiimoteEmu/WiimoteEmu.h" -#include "Movie.h" -#include "../ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/Movie.h" +#include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "ControllerInterface/ControllerInterface.h" - -#include "../InputCommon/InputConfig.h" +#include "InputCommon/InputConfig.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" namespace Wiimote { diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 66541a6e9c..2a99603324 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -4,8 +4,8 @@ #pragma once -#include "../InputCommon/InputConfig.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "InputCommon/InputConfig.h" enum { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index dbb718d211..cb7faafdc7 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h index ba49885c86..01b783603b 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h @@ -4,8 +4,8 @@ #pragma once -#include "ControllerEmu.h" -#include "../WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "InputCommon/ControllerEmu.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp index efa4b4a3b7..915d051c94 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Classic.h" - +#include "Core/HW/WiimoteEmu/Attachment/Classic.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h index edcd57c877..6094ecbe6d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h @@ -4,7 +4,7 @@ #pragma once -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp index 7a4b2dbeb5..35a1fe8e87 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Drums.h" - +#include "Core/HW/WiimoteEmu/Attachment/Drums.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h index 1228a98e81..8c2bbc17bc 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h @@ -4,7 +4,7 @@ #pragma once -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index dd33309481..51c3224e31 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Guitar.h" - +#include "Core/HW/WiimoteEmu/Attachment/Guitar.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h index 3ab4fae65f..379096c11e 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h @@ -4,7 +4,7 @@ #pragma once -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp index 89c8d09ecc..d306c111c3 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Nunchuk.h" +#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" -#include "UDPWrapper.h" -#include "UDPWiimote.h" +#include "InputCommon/UDPWiimote.h" +#include "InputCommon/UDPWrapper.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h index beb65949ce..83a7540c46 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h @@ -4,7 +4,7 @@ #pragma once -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" class UDPWrapper; diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index 39a0f8ddaa..650d5b6720 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Turntable.h" - +#include "Core/HW/WiimoteEmu/Attachment/Turntable.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h index 8275961eb4..48b3658ce1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h @@ -4,7 +4,7 @@ #pragma once -#include "Attachment.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index ede4e67f4b..0a56b60b2b 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -16,18 +16,17 @@ 0x10 - 0x1a leads to a 0x22 Input report 0x30 - 0x3f Input This file: Update() */ -#include -#include #include +#include +#include -#include "Common.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" -#include "WiimoteEmu.h" -#include "WiimoteHid.h" -#include "../WiimoteReal/WiimoteReal.h" - -#include "Attachment/Attachment.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp index 3c0c111a90..8d2efd0fb8 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp @@ -5,8 +5,8 @@ // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com) -#include "Common.h" -#include "Encryption.h" +#include "Common/Common.h" +#include "Core/HW/WiimoteEmu/Encryption.h" static const u8 ans_tbl[7][6] = { diff --git a/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h index d7eeaf8c8d..fce9d97544 100644 --- a/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h +++ b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h @@ -4,7 +4,7 @@ #pragma once -#include +#include #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp index fdf3af9358..1a9e3c7b17 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" //#define WIIMOTE_SPEAKER_DUMP #ifdef WIIMOTE_SPEAKER_DUMP +#include #include -#include "WaveFile.h" -#include -#include "FileUtil.h" +#include "AudioCommon/WaveFile.h" +#include "Common/FileUtil.h" #endif namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h index 8e9ac254ea..7a827d48a5 100644 --- a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h +++ b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h @@ -6,8 +6,8 @@ #pragma once -#include "UDPWiimote.h" -#include "WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "InputCommon/UDPWiimote.h" namespace UDPTLayer { diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index ae506a1bce..520dd4119d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -4,31 +4,28 @@ #include -#include "Attachment/Classic.h" -#include "Attachment/Nunchuk.h" -#include "Attachment/Guitar.h" -#include "Attachment/Drums.h" -#include "Attachment/Turntable.h" +#include "Common/Common.h" +#include "Common/Timer.h" -#include "WiimoteEmu.h" -#include "WiimoteHid.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/NetPlayClient.h" -#include "../WiimoteReal/WiimoteReal.h" +#include "Core/HW/WiimoteEmu/MatrixMath.h" +#include "Core/HW/WiimoteEmu/UDPTLayer.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/HW/WiimoteEmu/Attachment/Classic.h" +#include "Core/HW/WiimoteEmu/Attachment/Drums.h" +#include "Core/HW/WiimoteEmu/Attachment/Guitar.h" +#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" +#include "Core/HW/WiimoteEmu/Attachment/Turntable.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "Timer.h" -#include "Common.h" -#include "../../Host.h" -#include "../../ConfigManager.h" - -#include "UDPTLayer.h" inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } //because damn MSVSC doesen't comply to C99 -#include "MatrixMath.h" - -#include "../../Movie.h" -#include "NetPlayClient.h" - namespace { // :) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 8b24fcfac5..99979efb69 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -4,17 +4,15 @@ #pragma once -#include "../../Core.h" - -#include "ControllerEmu.h" -#include "ChunkFile.h" - -#include "WiimoteHid.h" -#include "Encryption.h" -#include "UDPWrapper.h" - -#include #include +#include + +#include "Common/ChunkFile.h" +#include "Core/Core.h" +#include "Core/HW/WiimoteEmu/Encryption.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/UDPWrapper.h" // Registry sizes #define WIIMOTE_EEPROM_SIZE (16*1024) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h index e25edfc6cf..9befb27634 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" // what is this ? #ifdef _MSC_VER diff --git a/Source/Core/Core/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp index 57034ff09a..f410a04394 100644 --- a/Source/Core/Core/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp @@ -1,22 +1,9 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" -#include "WiimoteReal.h" +#include "Common/Common.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" namespace WiimoteReal { diff --git a/Source/Core/Core/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/HW/WiimoteReal/IONix.cpp index 0f4fe5e730..4684aee61a 100644 --- a/Source/Core/Core/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IONix.cpp @@ -1,27 +1,14 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include #include #include #include -#include "Common.h" -#include "WiimoteReal.h" +#include "Common/Common.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" namespace WiimoteReal { diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index e08e160f61..f306465b01 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -2,26 +2,26 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "Common.h" -#include "WiimoteReal.h" -#include "StringUtil.h" - // Used for pair up #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WINXPSP2 -#include -#include + +#include +#include +#include +#include +#include +#include +#include +// The following Windows headers MUST be included after windows.h. +#include //NOLINT +#include //NOLINT +#include //NOLINT + +#include "Common/Common.h" +#include "Common/StringUtil.h" + +#include "Core/HW/WiimoteReal/WiimoteReal.h" //#define AUTHENTICATE_WIIMOTES #define SHARE_WRITE_WIIMOTES diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index c094c97c13..8ac433a095 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -1,7 +1,7 @@ #define BLUETOOTH_VERSION_USE_CURRENT -#include "Common.h" -#include "WiimoteReal.h" +#include "Common/Common.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" @interface SearchBT: NSObject { @public diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index e5f7fe8724..b185f62549 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -2,23 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include -#include +#include +#include + +#include "Common/Common.h" +#include "Common/IniFile.h" +#include "Common/StringUtil.h" +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "Common.h" -#include "IniFile.h" -#include "StringUtil.h" -#include "Timer.h" -#include "Host.h" -#include "ConfigManager.h" #include "SFML/Network.hpp" - -#include "WiimoteReal.h" - -#include "../WiimoteEmu/WiimoteHid.h" - unsigned int g_wiimote_sources[MAX_BBMOTES]; namespace WiimoteReal diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 72db5a6d61..d84dc9da58 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -7,16 +7,16 @@ #include #include -#include "WiimoteRealBase.h" -#include "ChunkFile.h" -#include "Thread.h" -#include "FifoQueue.h" -#include "Timer.h" +#include "Common/ChunkFile.h" +#include "Common/FifoQueue.h" +#include "Common/Thread.h" +#include "Common/Timer.h" -#include "../Wiimote.h" -#include "../WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteReal/WiimoteRealBase.h" -#include "../InputCommon/InputConfig.h" +#include "InputCommon/InputConfig.h" typedef std::vector Report; diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IPC_HLE/ICMP.h index de7e9294fa..2b3b49bb23 100644 --- a/Source/Core/Core/IPC_HLE/ICMP.h +++ b/Source/Core/Core/IPC_HLE/ICMP.h @@ -6,7 +6,7 @@ #include #endif -#include "Common.h" +#include "Common/Common.h" int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length); int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 data_length); diff --git a/Source/Core/Core/IPC_HLE/ICMPWin.cpp b/Source/Core/Core/IPC_HLE/ICMPWin.cpp index b1d3f5da97..07610673ea 100644 --- a/Source/Core/Core/IPC_HLE/ICMPWin.cpp +++ b/Source/Core/Core/IPC_HLE/ICMPWin.cpp @@ -1,4 +1,4 @@ -#include "ICMP.h" +#include "Core/IPC_HLE/ICMP.h" enum { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index 1029a39ecb..fadd41422d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -20,39 +20,41 @@ in case of success they are They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp. */ +#include #include #include -#include -#include "Common.h" -#include "CommonPaths.h" -#include "Thread.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device.h" -#include "WII_IPC_HLE_Device_DI.h" -#include "WII_IPC_HLE_Device_FileIO.h" -#include "WII_IPC_HLE_Device_stm.h" -#include "WII_IPC_HLE_Device_fs.h" -#include "WII_IPC_HLE_Device_net.h" -#include "WII_IPC_HLE_Device_net_ssl.h" -#include "WII_IPC_HLE_Device_es.h" -#include "WII_IPC_HLE_Device_usb.h" -#include "WII_IPC_HLE_Device_usb_kbd.h" -#include "WII_IPC_HLE_Device_sdio_slot0.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/Thread.h" + +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/WII_IPC.h" + +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #if defined(__LIBUSB__) || defined (_WIN32) - #include "WII_IPC_HLE_Device_hid.h" + #include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" #endif -#include "FileUtil.h" // For Copy -#include "../ConfigManager.h" -#include "../HW/CPU.h" -#include "../HW/Memmap.h" -#include "../HW/WII_IPC.h" -#include "../Debugger/Debugger_SymbolMap.h" -#include "../PowerPC/PowerPC.h" -#include "../HW/SystemTimers.h" -#include "CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" namespace WII_IPC_HLE_Interface diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h index 20528b1142..2bd3983f9d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h @@ -4,7 +4,7 @@ #pragma once -#include "ChunkFile.h" +#include "Common/ChunkFile.h" class IWII_IPC_HLE_Device; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h index d47e2972f4..d5888e9295 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h @@ -4,11 +4,12 @@ #pragma once -#include #include -#include "../HW/Memmap.h" +#include -#include "ChunkFile.h" +#include "Common/ChunkFile.h" + +#include "Core/HW/Memmap.h" #define FS_SUCCESS (u32)0 // Success #define FS_EACCES (u32)-1 // Permission denied diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 17009fb33d..3b6f19a283 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -2,25 +2,25 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include "WII_IPC_HLE_Device_DI.h" -#include "WII_IPC_HLE.h" - -#include "../HW/DVDInterface.h" -#include "../HW/CPU.h" -#include "../HW/Memmap.h" -#include "../Core.h" -#include "../VolumeHandler.h" -#include "VolumeCreator.h" -#include "Filesystem.h" -#include "LogManager.h" -#include "../HW/SystemTimers.h" - -#include "../../DiscIO/FileMonitor.h" - #include +#include "Common/Common.h" +#include "Common/LogManager.h" + +#include "Core/Core.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/SystemTimers.h" + +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" + +#include "DiscIO/FileMonitor.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" + using namespace DVDInterface; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index fb9b466a4a..0d8b6f2adf 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -4,7 +4,7 @@ #pragma once -#include "WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" namespace DiscIO { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 82f3fdaec4..3a6d3283df 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FileUtil.h" -#include "StringUtil.h" -#include "ChunkFile.h" - -#include "WII_IPC_HLE_Device_fs.h" -#include "WII_IPC_HLE_Device_FileIO.h" -#include "NandPaths.h" #include +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" +#include "Common/StringUtil.h" + +#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h" + static Common::replace_v replacements; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index 0b7ac92d8b..93bfe97604 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -4,8 +4,8 @@ #pragma once -#include "WII_IPC_HLE_Device.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" std::string HLE_IPC_BuildFilename(std::string _pFilename, int _size); void HLE_IPC_CreateVirtualFATFilesystem(); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ecb4f0eb29..90f586414c 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -33,26 +33,25 @@ */ // ============= -#include "WII_IPC_HLE_Device_es.h" - // need to include this before polarssl/aes.h, // otherwise we may not get __STDC_FORMAT_MACROS #include -#include "../PowerPC/PowerPC.h" -#include "../VolumeHandler.h" -#include "FileUtil.h" #include -#include "ConfigManager.h" -#include "../Boot/Boot_DOL.h" -#include "NandPaths.h" -#include "CommonPaths.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "../Movie.h" -#include "StringUtil.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" +#include "Common/StringUtil.h" -#include "ec_wii.h" +#include "Core/ConfigManager.h" +#include "Core/ec_wii.h" +#include "Core/Movie.h" +#include "Core/VolumeHandler.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 #include diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h index 2dd22dfc58..8f4d198f98 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -5,10 +5,11 @@ #pragma once #include -#include "WII_IPC_HLE_Device.h" -#include "NANDContentLoader.h" #include +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +#include "DiscIO/NANDContentLoader.h" + class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device { public: diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index e4a690ceae..fbc213c80f 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -2,20 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" +#include "Common/StringUtil.h" -#include "WII_IPC_HLE_Device_fs.h" -#include "WII_IPC_HLE_Device_FileIO.h" - -#include "StringUtil.h" -#include "FileSearch.h" -#include "FileUtil.h" -#include "NandPaths.h" -#include "ChunkFile.h" -#include "../HW/SystemTimers.h" - -#include "../VolumeHandler.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/SystemTimers.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h" #define MAX_NAME 12 diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h index 05c6569b52..f8c7c9661b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -4,7 +4,7 @@ #pragma once -#include "WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" struct NANDStat { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index 4a880a95da..64958bcc95 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../Core.h" -#include "../Debugger/Debugger_SymbolMap.h" -#include "../HW/WII_IPC.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device_hid.h" -#include "errno.h" +#include + +#include "Core/Core.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/WII_IPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" #define MAX_DEVICE_DEVNUM 256 static u64 hidDeviceAliases[MAX_DEVICE_DEVNUM]; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h index a33459244a..c3d3f53580 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -4,12 +4,13 @@ #pragma once -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device.h" #include -#include "Thread.h" #include +#include "Common/Thread.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" + #define HID_ID_MASK 0x0000FFFFFFFFFFFF #define MAX_HID_INTERFACES 1 diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 8458103908..4bcccd8f03 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -2,24 +2,27 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "WII_IPC_HLE_Device_es.h" -#include "WII_IPC_HLE_Device_net.h" -#include "../ConfigManager.h" -#include "FileUtil.h" -#include +#include #include -#include "ICMP.h" -#include "CommonPaths.h" -#include "SettingsHandler.h" -#include "ec_wii.h" -#include "WII_Socket.h" + +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/SettingsHandler.h" +#include "Common/StringUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/ec_wii.h" +#include "Core/IPC_HLE/ICMP.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" +#include "Core/IPC_HLE/WII_Socket.h" #ifdef _WIN32 #include #include #include -#include "fakepoll.h" +#include "Core/IPC_HLE/fakepoll.h" #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x)) #define FREE(x) HeapFree(GetProcessHeap(), 0, (x)) @@ -455,7 +458,6 @@ bool CWII_IPC_HLE_Device_net_wd_command::Close(u32 CommandAddress, bool Force) // This is just for debugging / playing around. // There really is no reason to implement wd unless we can bend it such that // we can talk to the DS. -#include "StringUtil.h" bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress) { u32 return_value = 0; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h index 67e731d047..4c2f112904 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -4,13 +4,14 @@ #pragma once -#include "WII_IPC_HLE_Device.h" +#include "Common/FileUtil.h" +#include "Common/Timer.h" + +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #ifdef _WIN32 #include #endif -#include "Timer.h" -#include "FileUtil.h" // data layout of the network configuration file (/shared2/sys/net/02/config.dat) // needed for /dev/net/ncd/manage diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp index 65673f86c9..ba92259cb1 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "WII_IPC_HLE_Device_net_ssl.h" -#include "WII_Socket.h" +#include "Common/FileUtil.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" +#include "Core/IPC_HLE/WII_Socket.h" WII_SSL CWII_IPC_HLE_Device_net_ssl::_SSL[NET_SSL_MAXINSTANCES]; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h index 25b1abdef0..80e87eafba 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h @@ -4,11 +4,11 @@ #pragma once -#include "WII_IPC_HLE_Device.h" - +#include #include #include -#include + +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #define NET_SSL_MAX_HOSTNAME_LEN 256 #define NET_SSL_MAXINSTANCES 4 diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index 07ceef30e4..25e4f8283b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -2,17 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "../ConfigManager.h" +#include "Common/Common.h" +#include "Common/SDCardUtil.h" -#include "SDCardUtil.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device_sdio_slot0.h" - -#include "../HW/CPU.h" -#include "../HW/Memmap.h" -#include "../Core.h" CWII_IPC_HLE_Device_sdio_slot0::CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index 6987fdf465..b237c67fd5 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -6,7 +6,7 @@ #pragma once -#include "WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h index b97bf41921..10b5ef5d6e 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h @@ -4,7 +4,7 @@ #pragma once -#include "WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" enum { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 95f409a92b..bcc83c8078 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -2,17 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../Core.h" -#include "../Debugger/Debugger_SymbolMap.h" -#include "../Host.h" -#include "../HW/SystemTimers.h" -#include "../HW/Wiimote.h" -#include "../HW/WII_IPC.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device_usb.h" -#include "../ConfigManager.h" -#include "../Movie.h" -#include "CoreTiming.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/WII_IPC.h" +#include "Core/HW/Wiimote.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" // The device class CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _DeviceID, const std::string& _rDeviceName) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h index 6798f5d9a5..0cdcea9575 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -5,14 +5,14 @@ #pragma once #include -#include #include +#include -#include "hci.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device.h" -#include "WII_IPC_HLE_WiiMote.h" -#include "../HW/Wiimote.h" +#include "Core/HW/Wiimote.h" +#include "Core/IPC_HLE/hci.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" struct SQueuedEvent { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp index 978cd2313a..a50a47cfbc 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../ConfigManager.h" -#include "../Core.h" // Local core functions -#include "WII_IPC_HLE_Device_usb.h" -#include "WII_IPC_HLE_Device_usb_kbd.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" // Local core functions +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #ifdef _WIN32 #include diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 07f6d37774..9eb3b778b1 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -2,17 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" // Common -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" -#include "WII_IPC_HLE_WiiMote.h" // Core -#include "WII_IPC_HLE_Device_usb.h" -#include "../ConfigManager.h" -#include "../Host.h" -#include "../Core.h" -#include "../HW/Wiimote.h" -#include "l2cap.h" // Local -#include "WiiMote_HID_Attr.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/HW/Wiimote.h" +#include "Core/IPC_HLE/l2cap.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" +#include "Core/IPC_HLE/WiiMote_HID_Attr.h" static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h index 18c1869758..afa78d75e3 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -6,8 +6,9 @@ #include #include -#include "hci.h" -#include "ChunkFile.h" + +#include "Common/ChunkFile.h" +#include "Core/IPC_HLE/hci.h" class CWII_IPC_HLE_Device_usb_oh1_57e_305; diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp index 4a4527ea4b..d036a88c3d 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.cpp +++ b/Source/Core/Core/IPC_HLE/WII_Socket.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "WII_Socket.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device.h" -// No Wii socket support while using NetPlay or TAS -#include "NetPlayProto.h" -#include "Movie.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +#include "Core/IPC_HLE/WII_Socket.h" // No Wii socket support while using NetPlay or TAS + using WII_IPC_HLE_Interface::ECommandType; using WII_IPC_HLE_Interface::COMMAND_IOCTL; diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index 153ebc3b20..cb0a9db37c 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -39,16 +39,16 @@ typedef struct pollfd pollfd_t; #include #endif -#include // std::for_each -#include -#include -#include +#include +#include #include +#include +#include -#include "FileUtil.h" -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device_net.h" -#include "WII_IPC_HLE_Device_net_ssl.h" +#include "Common/FileUtil.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" enum { SO_MSG_OOB = 0x01, diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp index 57e60e8899..00cc60b7a2 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" #include -#include "WiiMote_HID_Attr.h" + +#include "Common/Common.h" +#include "Core/IPC_HLE/WiiMote_HID_Attr.h" #if 0 // 0x00 (checked) diff --git a/Source/Core/Core/MemTools.h b/Source/Core/Core/MemTools.h index 7dc7e20600..276af3d887 100644 --- a/Source/Core/Core/MemTools.h +++ b/Source/Core/Core/MemTools.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" namespace EMM diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 019d2b0a63..67b14fb131 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -2,28 +2,30 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Movie.h" +#include -#include "Core.h" -#include "ConfigManager.h" -#include "Thread.h" -#include "FileUtil.h" -#include "PowerPC/PowerPC.h" -#include "HW/SI.h" -#include "HW/Wiimote.h" -#include "HW/WiimoteEmu/WiimoteEmu.h" -#include "HW/WiimoteEmu/WiimoteHid.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "State.h" -#include "Timer.h" -#include "VideoConfig.h" -#include "HW/EXI.h" -#include "HW/EXI_Device.h" -#include "HW/EXI_Channel.h" -#include "HW/DVDInterface.h" -#include "../Common/NandPaths.h" -#include "polarssl/md5.h" -#include "NetPlayProto.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" +#include "Core/NetPlayProto.h" +#include "Core/State.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/EXI.h" +#include "Core/HW/EXI_Channel.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/SI.h" +#include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoConfig.h" // The chunk to allocate movie data in multiples of. #define DTM_BASE_LENGTH (1024) diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 912b8cb633..391449ddfd 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -4,12 +4,12 @@ #pragma once -#include "Common.h" -#include "../InputCommon/GCPadStatus.h" - #include -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" + +#include "InputCommon/GCPadStatus.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 8b4f6330ec..d60eb49259 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -2,24 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NetPlayClient.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" +#include "Core/NetPlayClient.h" +#include "Core/HW/EXI_DeviceIPL.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_DeviceDanceMat.h" +#include "Core/HW/SI_DeviceGCController.h" +#include "Core/HW/SI_DeviceGCSteeringWheel.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" -// for wiimote -#include "HW/WiimoteReal/WiimoteReal.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "IPC_HLE/WII_IPC_HLE_WiiMote.h" -// for gcpad -#include "HW/SI.h" -#include "HW/SI_DeviceGCController.h" -#include "HW/SI_DeviceGCSteeringWheel.h" -#include "HW/SI_DeviceDanceMat.h" -// for gctime -#include "HW/EXI_DeviceIPL.h" -// for wiimote/ OSD messages -#include "Core.h" -#include "ConfigManager.h" -#include "Movie.h" -#include "HW/WiimoteEmu/WiimoteEmu.h" std::mutex crit_netplay_client; static NetPlayClient * netplay_client = NULL; diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h index 4ea30dd760..81562dea4d 100644 --- a/Source/Core/Core/NetPlayClient.h +++ b/Source/Core/Core/NetPlayClient.h @@ -4,22 +4,22 @@ #pragma once -#include "Common.h" -#include "CommonTypes.h" -#include "Thread.h" -#include "Timer.h" - -#include - -#include "NetPlayProto.h" -#include "GCPadStatus.h" - #include #include #include #include -#include "FifoQueue.h" +#include + +#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/FifoQueue.h" +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "Core/NetPlayProto.h" + +#include "InputCommon/GCPadStatus.h" class NetPad { diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index a0a650e8a3..14eb998f68 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -4,9 +4,10 @@ #pragma once -#include "Common.h" -#include "CommonTypes.h" -#include "HW/EXI_Device.h" +#include "Common/Common.h" +#include "Common/CommonTypes.h" + +#include "Core/HW/EXI_Device.h" struct NetSettings { diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index fa9e11b8ba..f02b3c0a2b 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NetPlayServer.h" +#include "Core/NetPlayServer.h" NetPlayServer::~NetPlayServer() { diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index 0ed10d4f55..ff81565653 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -4,20 +4,20 @@ #pragma once -#include "Common.h" -#include "CommonTypes.h" -#include "Thread.h" -#include "Timer.h" - -#include - -#include "NetPlayProto.h" - #include #include #include #include +#include + +#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "Core/NetPlayProto.h" + class NetPlayServer { public: diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index d01ed5a400..5882fef75f 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -15,20 +15,21 @@ // [OnLoad] // 0x80020394=dword,0x4e800020 +#include +#include #include #include -#include -#include -#include "CommonPaths.h" -#include "StringUtil.h" -#include "PatchEngine.h" -#include "HW/Memmap.h" -#include "ActionReplay.h" -#include "GeckoCode.h" -#include "GeckoCodeConfig.h" -#include "FileUtil.h" -#include "ConfigManager.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "Core/ActionReplay.h" +#include "Core/ConfigManager.h" +#include "Core/GeckoCode.h" +#include "Core/GeckoCodeConfig.h" +#include "Core/PatchEngine.h" +#include "Core/HW/Memmap.h" using namespace Common; diff --git a/Source/Core/Core/PatchEngine.h b/Source/Core/Core/PatchEngine.h index e347a0758c..b601e41d39 100644 --- a/Source/Core/Core/PatchEngine.h +++ b/Source/Core/Core/PatchEngine.h @@ -4,7 +4,7 @@ #pragma once -#include "IniFile.h" +#include "Common/IniFile.h" namespace PatchEngine { diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index 3b1fd3d863..d73573c9dd 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -1,27 +1,13 @@ -// Copyright (C) 2010 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // Originally written by Sven Peter for anergistic. -#include "GDBStub.h" - +#include +#include #include #include -#include #include #ifdef _WIN32 #include @@ -32,9 +18,9 @@ #include #include #endif -#include -#include "Host.h" +#include "Core/Host.h" +#include "Core/PowerPC/GDBStub.h" #define GDB_BFR_MAX 10000 #define GDB_MAX_BP 10 diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h index c96b48f3b7..b7d9636659 100644 --- a/Source/Core/Core/PowerPC/GDBStub.h +++ b/Source/Core/Core/PowerPC/GDBStub.h @@ -7,11 +7,13 @@ #pragma once #include -#include "Common.h" -#include "Thread.h" -#include "PowerPC.h" -#include "../HW/CPU.h" -#include "../HW/Memmap.h" + +#include "Common/Common.h" +#include "Common/Thread.h" + +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 #define SIGTRAP 5 diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h index 7fd0295b3b..e14a10bcf2 100644 --- a/Source/Core/Core/PowerPC/Gekko.h +++ b/Source/Core/Core/PowerPC/Gekko.h @@ -7,7 +7,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // --- Gekko Instruction --- diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index dd71abcaeb..1eb74300bf 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -2,20 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include -#include "Interpreter.h" #include "PowerPCDisasm.h" -#include "../PPCTables.h" -#include "../../Debugger/Debugger_SymbolMap.h" -#include "../../Host.h" -#include "../../IPC_HLE/WII_IPC_HLE.h" + +#include "Core/Host.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" #ifdef USE_GDBSTUB -#include "../GDBStub.h" +#include "Core/PowerPC/GDBStub.h" #endif -#include - namespace { u32 last_pc; } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h index f9f252d4ec..0e58f98776 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h @@ -4,16 +4,16 @@ #pragma once -#include "Atomic.h" -#include "../Gekko.h" -#include "../PowerPC.h" -#include "../CPUCoreBase.h" -#include "../../Core.h" -#include "../../CoreTiming.h" -#include "../../ConfigManager.h" -#include "../../HLE/HLE.h" -#include "../../HW/Memmap.h" -#include "../../HW/CPU.h" +#include "Common/Atomic.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/CPUCoreBase.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PowerPC.h" class Interpreter : public CPUCoreBase { diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp index 5a3dc9e467..b64ee65c71 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Interpreter.h" -#include "../PPCAnalyst.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" void Interpreter::bx(UGeckoInstruction _inst) { diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h index d2c5c23c5a..48e5cc8523 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h @@ -4,9 +4,9 @@ #pragma once -#include "CPUDetect.h" -#include "Interpreter.h" -#include "MathUtil.h" +#include "Common/CPUDetect.h" +#include "Common/MathUtil.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" using namespace MathUtil; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 9056c6f717..3b51496663 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include #include #ifdef _WIN32 @@ -17,10 +17,10 @@ #undef _interlockedbittestandreset64 #endif -#include "Interpreter.h" -#include "Interpreter_FPUtils.h" -#include "MathUtil.h" -#include "../LUT_frsqrtex.h" +#include "Common/MathUtil.h" +#include "Core/PowerPC/LUT_frsqrtex.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" using namespace MathUtil; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp index 4fd420b234..5b32d50fe0 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" void Interpreter::Helper_UpdateCR0(u32 _uValue) { diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 3fb441f5b9..46013597fc 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "MathUtil.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" -#include "Interpreter.h" -#include "Interpreter_FPUtils.h" - -#include "../JitInterface.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" bool Interpreter::g_bReserve; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index 05a209ba2a..857e0ef7e8 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Interpreter.h" -#include "Interpreter_FPUtils.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" // dequantize table const float m_dequantizeTable[] = diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 601bdb0523..ce99a5cfe9 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include "Common.h" -#include "MathUtil.h" -#include "Interpreter.h" -#include "Interpreter_FPUtils.h" +#include +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" using namespace MathUtil; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 60c1410d42..db278e262f 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -14,12 +14,12 @@ #undef _interlockedbittestandreset64 #endif -#include "CPUDetect.h" -#include "Interpreter.h" -#include "Interpreter_FPUtils.h" -#include "FPURoundMode.h" -#include "../../HW/GPFifo.h" -#include "../../HW/SystemTimers.h" +#include "Common/CPUDetect.h" +#include "Common/FPURoundMode.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/SystemTimers.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" /* diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp index ec50040f57..81961682da 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Interpreter_Tables.h" +#include "Core/PowerPC/Interpreter/Interpreter_Tables.h" typedef void (*_Instruction) (UGeckoInstruction instCode); diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h index fe96067840..6e49b36b46 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h @@ -6,7 +6,7 @@ #include "../Gekko.h" #include "../PPCTables.h" -#include "Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" namespace InterpreterTables { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 2186bf8784..e34ab8c6ae 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -9,15 +9,15 @@ #include #endif -#include "Common.h" -#include "../../HLE/HLE.h" -#include "../../PatchEngine.h" -#include "../Profiler.h" -#include "Jit.h" -#include "JitAsm.h" -#include "JitRegCache.h" -#include "Jit64_Tables.h" -#include "HW/ProcessorInterface.h" +#include "Common/Common.h" +#include "Core/PatchEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/Jit64_Tables.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" #if defined(_DEBUG) || defined(DEBUGFAST) #include "PowerPCDisasm.h" #endif diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 4f00aac342..b1c9d0ef45 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -18,23 +18,24 @@ // ---------- #pragma once -#include "../JitCommon/JitBackpatch.h" -#include "../JitCommon/JitBase.h" -#include "../JitCommon/JitCache.h" -#include "../JitCommon/Jit_Util.h" -#include "../PowerPC.h" -#include "../PPCAnalyst.h" -#include "../PPCTables.h" -#include "../../Core.h" -#include "../../CoreTiming.h" -#include "../../ConfigManager.h" -#include "../../HW/Memmap.h" -#include "../../HW/GPFifo.h" -#include "JitAsm.h" -#include "JitRegCache.h" -#include "x64ABI.h" -#include "x64Analyzer.h" -#include "x64Emitter.h" +#include "Common/x64ABI.h" +#include "Common/x64Analyzer.h" +#include "Common/x64Emitter.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" class Jit64 : public Jitx86Base { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index 47b20ec4de..add12a60ef 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Jit.h" -#include "Jit64_Tables.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/Jit64_Tables.h" // Should be moved in to the Jit class typedef void (Jit64::*_Instruction) (UGeckoInstruction instCode); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h index 4a45405a9f..c963ac1f7b 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h @@ -4,9 +4,9 @@ #pragma once -#include "../Gekko.h" -#include "../PPCTables.h" -#include "../Jit64/Jit.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Jit64/Jit.h" namespace Jit64Tables { diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index 56975ef6ea..667a6d0816 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MemoryUtil.h" +#include "Common/MemoryUtil.h" -#include "Jit.h" -#include "JitAsm.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/PowerPC/Jit64/JitAsm.h index 4399663f80..f2475ee036 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.h +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.h @@ -4,7 +4,7 @@ #pragma once -#include "../JitCommon/JitAsmCommon.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" // In Dolphin, we don't use inline assembly. Instead, we generate all machine-near // code at runtime. In the case of fixed code like this, after writing it, we write diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp index 6e4815ec0d..73017b5ebd 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Jit.h" -#include "JitAsm.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" using namespace Gen; using namespace PowerPC; diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h index db9c377633..c27f46680a 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h @@ -4,7 +4,7 @@ #pragma once -#include "x64Emitter.h" +#include "Common/x64Emitter.h" using namespace Gen; enum FlushMode diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index 36cf011873..aa07251c7d 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" // The branches are known good, or at least reasonably good. // No need for a disable-mechanism. diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 9607e9a0c4..389c29ca07 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" -#include "Jit.h" -#include "JitRegCache.h" -#include "CPUDetect.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" static const u64 GC_ALIGNED16(psSignBits2[2]) = {0x8000000000000000ULL, 0x8000000000000000ULL}; static const u64 GC_ALIGNED16(psAbsMask2[2]) = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL}; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 177708bf00..812c203309 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" void Jit64::GenerateConstantOverflow(bool overflow) { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 1b41c2f1e9..7c5078a816 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -5,11 +5,11 @@ // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. // Should give a very noticable speed boost to paired single heavy code. -#include "Common.h" +#include "Common/Common.h" -#include "Jit.h" -#include "JitAsm.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" void Jit64::lXXx(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index b99d04e52c..5429cc7075 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -5,12 +5,12 @@ // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. // Should give a very noticeable speed boost to paired single heavy code. -#include "Common.h" -#include "CPUDetect.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" -#include "Jit.h" -#include "JitAsm.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" // pshufb todo: MOVQ const u8 GC_ALIGNED16(bswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 4ebe583004..d2557d3d1b 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -5,12 +5,12 @@ // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. // Should give a very noticeable speed boost to paired single heavy code. -#include "Common.h" -#include "CPUDetect.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" -#include "Jit.h" -#include "JitAsm.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15}; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index 781b75a538..1af82d26b5 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "Jit.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" // TODO // ps_madds0 diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index 690d3d8ca8..9bfefabd2f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "../../HW/SystemTimers.h" -#include "HW/ProcessorInterface.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SystemTimers.h" -#include "Jit.h" -#include "JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" void Jit64::mtspr(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp index 60ef5290ca..dca36196bf 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp @@ -24,10 +24,10 @@ The register allocation is linear scan allocation. #pragma warning(disable:4146) // unary minus operator applied to unsigned type, result still unsigned #endif -#include "JitIL.h" -#include "../../../Common/CPUDetect.h" -#include "MathUtil.h" -#include "HW/ProcessorInterface.h" +#include "Common/CPUDetect.h" +#include "Common/MathUtil.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" using namespace IREmitter; using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index bd4a38fdcb..d24b058218 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include // For profiling #include #include -#include -#include "Common.h" -#include "../../HLE/HLE.h" -#include "../../PatchEngine.h" -#include "../Profiler.h" -#include "JitIL.h" -#include "JitILAsm.h" -#include "JitIL_Tables.h" +#include "Common/Common.h" +#include "Core/PatchEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" +#include "Core/PowerPC/Jit64IL/JitIL_Tables.h" +#include "Core/PowerPC/Jit64IL/JitILAsm.h" using namespace Gen; using namespace PowerPC; @@ -130,10 +131,6 @@ ps_adds1 */ - -// For profiling -#include - #ifdef _WIN32 #include #include diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h index fab95f4687..146f905f73 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h @@ -16,24 +16,25 @@ #pragma once -#include "JitILAsm.h" -#include "x64Emitter.h" -#include "x64ABI.h" -#include "x64Analyzer.h" -#include "../PowerPC.h" -#include "../PPCTables.h" -#include "../PPCAnalyst.h" -#include "../JitCommon/JitBase.h" -#include "../JitCommon/JitCache.h" -#include "../JitCommon/JitBackpatch.h" -#include "../JitCommon/Jit_Util.h" -#include "../JitILCommon/JitILBase.h" -#include "../JitILCommon/IR.h" -#include "../../ConfigManager.h" -#include "../../Core.h" -#include "../../CoreTiming.h" -#include "../../HW/Memmap.h" -#include "../../HW/GPFifo.h" +#include "Common/x64ABI.h" +#include "Common/x64Analyzer.h" +#include "Common/x64Emitter.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Jit64IL/JitILAsm.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "Core/PowerPC/JitILCommon/IR.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" #ifdef _M_X64 #define DISABLE64 \ diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp index a909d32725..79ea71a811 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "JitIL.h" -#include "JitILAsm.h" +#include "Common/CPUDetect.h" +#include "Common/MemoryUtil.h" -#include "MemoryUtil.h" -#include "CPUDetect.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" +#include "Core/PowerPC/Jit64IL/JitILAsm.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h index 6af6b441f9..a465df88e2 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h @@ -4,8 +4,8 @@ #pragma once -#include "x64Emitter.h" -#include "../JitCommon/JitAsmCommon.h" +#include "Common/x64Emitter.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" // In Dolphin, we don't use inline assembly. Instead, we generate all machine-near // code at runtime. In the case of fixed code like this, after writing it, we write diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp index 0ed40947f6..39fce69247 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "JitIL_Tables.h" +#include "Core/PowerPC/Jit64IL/JitIL_Tables.h" // Should be moved in to the Jit class typedef void (JitIL::*_Instruction) (UGeckoInstruction instCode); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h index 7225bf8abc..c1150ae23b 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h @@ -5,9 +5,9 @@ #ifndef JITIL_TABLES_H #define JITIL_TABLES_H -#include "../Gekko.h" -#include "../PPCTables.h" -#include "../Jit64IL/JitIL.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" namespace JitILTables { diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index 6b8e76eb9d..3c4cdf6ca5 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -1,38 +1,26 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include -#include "Common.h" -#include "../../HLE/HLE.h" -#include "../../Core.h" -#include "../../PatchEngine.h" -#include "../../CoreTiming.h" -#include "../../ConfigManager.h" -#include "../PowerPC.h" -#include "../Profiler.h" -#include "../PPCTables.h" -#include "../PPCAnalyst.h" -#include "../../HW/Memmap.h" -#include "../../HW/GPFifo.h" -#include "Jit.h" -#include "JitArm_Tables.h" -#include "ArmEmitter.h" -#include "../JitInterface.h" +#include "Common/ArmEmitter.h" +#include "Common/Common.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PatchEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArm_Tables.h" using namespace ArmGen; using namespace PowerPC; diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.h b/Source/Core/Core/PowerPC/JitArm32/Jit.h index 0e9e8fe3b2..505f649a5d 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.h @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // ======================== // See comments in Jit.cpp. @@ -31,13 +18,13 @@ // ---------- #pragma once -#include "../CPUCoreBase.h" -#include "../PPCAnalyst.h" -#include "JitArmCache.h" -#include "JitRegCache.h" -#include "JitFPRCache.h" -#include "JitAsm.h" -#include "../JitCommon/JitBase.h" +#include "Core/PowerPC/CPUCoreBase.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/JitArm32/JitArmCache.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitFPRCache.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) class JitArm : public JitBase, public ArmGen::ARMXCodeBlock diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.cpp index 82956364de..2fdd195140 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // Enable define below to enable oprofile integration. For this to work, // it requires at least oprofile version 0.9.4, and changing the build @@ -22,9 +9,9 @@ // performance hit, it's not enabled by default, but it's useful for // locating performance issues. -#include "../JitInterface.h" -#include "Jit.h" -#include "JitArmCache.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArmCache.h" using namespace ArmGen; diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h index 8f0cc4997b..cd41399dba 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h @@ -4,7 +4,7 @@ #pragma once -#include "../JitCommon/JitCache.h" +#include "Core/PowerPC/JitCommon/JitCache.h" typedef void (*CompiledCode)(); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp index 79fb88a7d5..4be36390eb 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -1,28 +1,15 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include -#include "Common.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" -#include "../../HW/Memmap.h" -#include "Jit.h" -#include "../JitCommon/JitBackpatch.h" -#include "StringUtil.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" // This generates some fairly heavy trampolines, but: // 1) It's really necessary. We don't know anything about the context. diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp index 6d8ed81097..4e535d2cd3 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp @@ -1,30 +1,17 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" // The branches are known good, or at least reasonably good. // No need for a disable-mechanism. diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h b/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h index 41b794aea5..265ba2deb6 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h @@ -1,14 +1,15 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. + #pragma once -#include "../Interpreter/Interpreter_FPUtils.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" -#include "Jit.h" -#include "JitRegCache.h" -#include "JitFPRCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitFPRCache.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" static const double minmaxFloat[2] = {-(double)0x80000000, (double)0x7FFFFFFF}; static const double doublenum = 0xfff8000000000000ull; diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 28e9723333..a66cdbed8b 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -1,35 +1,21 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../ConfigManager.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" -#include "../../HW/Memmap.h" -#include "JitArm_FPUtils.h" - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitFPRCache.h" -#include "JitAsm.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitFPRCache.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::Helper_UpdateCR1(ARMReg fpscr, ARMReg temp) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp index 21d653d31b..525903bfc9 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp @@ -1,30 +1,19 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" extern u32 Helper_Mask(u8 mb, u8 me); // Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp index 3983772aa6..d8de044e92 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -1,34 +1,20 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../ConfigManager.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" -#include "../../HW/Memmap.h" - - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp index 96c7fd4bcc..62389aad10 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -1,35 +1,21 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../ConfigManager.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" -#include "../../HW/Memmap.h" - - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitFPRCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitFPRCache.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::lfXX(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp index 244ae1db22..e11e22f065 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp @@ -1,17 +1,18 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" + +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::psq_l(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Paired.cpp index 53d5e7bd8d..f4ec4930c0 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Paired.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Paired.cpp @@ -1,31 +1,19 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" -#include "JitArm_FPUtils.h" - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::ps_rsqrte(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index bc0ded7d53..e1a8c55d92 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -1,30 +1,18 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/Common.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ -#include "Common.h" - -#include "../../Core.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "../PPCTables.h" -#include "ArmEmitter.h" - -#include "Jit.h" -#include "JitRegCache.h" -#include "JitAsm.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::mtspr(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp index a999f449d2..661cc6abf0 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp @@ -1,23 +1,10 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Jit.h" -#include "../JitInterface.h" -#include "JitArm_Tables.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArm_Tables.h" // Should be moved in to the Jit class typedef void (JitArm::*_Instruction) (UGeckoInstruction instCode); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h index c858d771f6..69b5fda995 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h @@ -1,24 +1,11 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #pragma once -#include "../Gekko.h" -#include "../PPCTables.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCTables.h" namespace JitArmTables { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp index 33a2a1a70f..8cec544b9d 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp @@ -1,34 +1,20 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. +#include "Common/ArmEmitter.h" +#include "Common/MemoryUtil.h" -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitAsm.h" +#include "Core/PowerPC/JitCommon/JitCache.h" -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - - -#include "../../HW/Memmap.h" - -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "MemoryUtil.h" - -#include "Jit.h" -#include "../JitCommon/JitCache.h" - -#include "../../HW/GPFifo.h" -#include "../../Core.h" -#include "JitAsm.h" -#include "ArmEmitter.h" using namespace ArmGen; diff --git a/Source/Core/Core/PowerPC/JitArm32/JitAsm.h b/Source/Core/Core/PowerPC/JitArm32/JitAsm.h index a7cabda1dc..061a2bac39 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitAsm.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitAsm.h @@ -1,24 +1,12 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #pragma once -#include "ArmEmitter.h" -#include "../JitCommon/JitAsmCommon.h" +#include "Common/ArmEmitter.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" + using namespace ArmGen; class JitArmAsmRoutineManager : public CommonAsmRoutinesBase, public ARMXCodeBlock { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp index 7247ddbd1e..8f44a9c81f 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp @@ -1,22 +1,9 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Jit.h" -#include "JitFPRCache.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitFPRCache.h" ArmFPRCache::ArmFPRCache() { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h index 807e200cdb..1e2f1acfa7 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h @@ -4,10 +4,10 @@ #pragma once -#include "ArmEmitter.h" -#include "../Gekko.h" -#include "../PPCAnalyst.h" -#include "JitRegCache.h" +#include "Common/ArmEmitter.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" #define ARMFPUREGS 32 using namespace ArmGen; diff --git a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp index f1e678e971..c5f97d43a8 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp @@ -1,22 +1,9 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Jit.h" -#include "JitRegCache.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitRegCache.h" ArmRegCache::ArmRegCache() { diff --git a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h index 6271f58116..e1097e9a63 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h @@ -4,9 +4,9 @@ #pragma once -#include "ArmEmitter.h" -#include "../Gekko.h" -#include "../PPCAnalyst.h" +#include "Common/ArmEmitter.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCAnalyst.h" using namespace ArmGen; // This ARM Register cache actually pre loads the most used registers before diff --git a/Source/Core/Core/PowerPC/JitArmIL/IR_Arm.cpp b/Source/Core/Core/PowerPC/JitArmIL/IR_Arm.cpp index c1bee507fc..d563ad8662 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/IR_Arm.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/IR_Arm.cpp @@ -1,14 +1,15 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../JitILCommon/IR.h" -#include "../PPCTables.h" -#include "../../CoreTiming.h" -#include "../../HW/Memmap.h" -#include "JitILAsm.h" -#include "JitIL.h" -#include "ArmEmitter.h" -#include "../../Core.h" + +#include "Common/ArmEmitter.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitILAsm.h" +#include "Core/PowerPC/JitILCommon/IR.h" using namespace IREmitter; using namespace ArmGen; diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp index 79fde16224..ed7a39cbf4 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp @@ -1,25 +1,25 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. #include -#include "Common.h" -#include "../../HLE/HLE.h" -#include "../../Core.h" -#include "../../PatchEngine.h" -#include "../../CoreTiming.h" -#include "../../ConfigManager.h" -#include "../PowerPC.h" -#include "../Profiler.h" -#include "../PPCTables.h" -#include "../PPCAnalyst.h" -#include "../../HW/Memmap.h" -#include "../../HW/GPFifo.h" -#include "JitIL.h" -#include "JitIL_Tables.h" -#include "ArmEmitter.h" -#include "../JitInterface.h" +#include "Common/ArmEmitter.h" +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PatchEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitIL_Tables.h" using namespace ArmGen; using namespace PowerPC; diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.h b/Source/Core/Core/PowerPC/JitArmIL/JitIL.h index 416dfaf3ac..20de0661c6 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.h @@ -1,16 +1,16 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. #pragma once -#include "../PPCAnalyst.h" -#include "ArmEmitter.h" -#include "../JitArm32/JitArmCache.h" -#include "../JitILCommon/JitILBase.h" -#include "../JitILCommon/IR.h" -#include "../JitCommon/JitBase.h" -#include "JitILAsm.h" +#include "Common/ArmEmitter.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/JitArm32/JitArmCache.h" +#include "Core/PowerPC/JitArmIL/JitILAsm.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitILCommon/IR.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" #define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) class JitArmIL : public JitILBase, public ArmGen::ARMXCodeBlock diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp index 2cb9e298f2..be7c34f5d8 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp @@ -1,20 +1,18 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../../HW/Memmap.h" -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "MemoryUtil.h" +#include "Common/ArmEmitter.h" +#include "Common/MemoryUtil.h" -#include "JitIL.h" -#include "../JitCommon/JitCache.h" - -#include "../../HW/GPFifo.h" -#include "../../Core.h" - -#include "JitILAsm.h" -#include "ArmEmitter.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitILAsm.h" +#include "Core/PowerPC/JitCommon/JitCache.h" JitArmILAsmRoutineManager armil_asm_routines; void JitArmILAsmRoutineManager::Generate() diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h index 884baf20e4..ef95b6db07 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h @@ -1,11 +1,12 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. #pragma once -#include "ArmEmitter.h" -#include "../JitCommon/JitAsmCommon.h" +#include "Common/ArmEmitter.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" + using namespace ArmGen; class JitArmILAsmRoutineManager : public CommonAsmRoutinesBase, public ARMXCodeBlock { diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Branch.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Branch.cpp index bad63dd5c6..65c0297d83 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Branch.cpp @@ -1,16 +1,15 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "../../ConfigManager.h" -#include "../PowerPC.h" -#include "../PPCTables.h" +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" -#include "JitIL.h" - -#include "../../HW/Memmap.h" #define NORMALBRANCH_START Default(inst); ibuild.EmitInterpreterBranch(); return; //#define NORMALBRANCH_START diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.cpp index eaa5951684..970898909d 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.cpp @@ -1,10 +1,10 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. -#include "JitIL.h" -#include "../JitInterface.h" -#include "JitIL_Tables.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitIL_Tables.h" // Should be moved in to the Jit class typedef void (JitArmIL::*_Instruction) (UGeckoInstruction instCode); diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h index 8e6e0bcd25..7d92e6cf0b 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h @@ -1,11 +1,11 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. #pragma once -#include "../Gekko.h" -#include "../PPCTables.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCTables.h" namespace JitArmILTables { diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp index db77323401..a448aac6a7 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "JitAsmCommon.h" -#include "JitBase.h" - -#include "CPUDetect.h" -#include "MemoryUtil.h" +#include "Common/CPUDetect.h" +#include "Common/MemoryUtil.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #define QUANTIZED_REGS_TO_SAVE (ABI_ALL_CALLEE_SAVED & ~((1 << RAX) | (1 << RCX) | (1 << RDX) | \ (1 << XMM0) | (1 << XMM1))) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h index a25df9889e..5d6e92a078 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h @@ -4,7 +4,7 @@ #pragma once -#include "Jit_Util.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" class CommonAsmRoutinesBase { diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp index 828d8a6a31..f99bfc65a5 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp @@ -2,15 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include -#include "Common.h" #include "disasm.h" -#include "JitBase.h" -#include "JitBackpatch.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" + #ifdef _WIN32 #include #endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h index 1d6a031b24..44cdfa00d0 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h @@ -4,9 +4,9 @@ #pragma once -#include "Common.h" -#include "x64Emitter.h" -#include "x64Analyzer.h" +#include "Common/Common.h" +#include "Common/x64Analyzer.h" +#include "Common/x64Emitter.h" // meh. #if defined(_WIN32) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp index d135e9864c..dc49c89b52 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp @@ -4,9 +4,10 @@ #include -#include "JitBase.h" -#include "PowerPCDisasm.h" #include "disasm.h" +#include "PowerPCDisasm.h" + +#include "Core/PowerPC/JitCommon/JitBase.h" JitBase *jit; diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index a2625eb5fb..fde0750017 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -8,24 +8,25 @@ //#define JIT_LOG_GPR // Enables logging of the PPC general purpose regs //#define JIT_LOG_FPR // Enables logging of the PPC floating point regs -#include "JitAsmCommon.h" -#include "JitCache.h" -#include "Jit_Util.h" // for EmuCodeBlock -#include "JitBackpatch.h" // for EmuCodeBlock -#include "x64ABI.h" -#include "x64Analyzer.h" -#include "x64Emitter.h" -#include "../CPUCoreBase.h" -#include "../PowerPC.h" -#include "../PPCAnalyst.h" -#include "../PPCTables.h" -#include "../../Core.h" -#include "../../CoreTiming.h" -#include "../../HW/GPFifo.h" -#include "../../HW/Memmap.h" - #include +#include "Common/x64ABI.h" +#include "Common/x64Analyzer.h" +#include "Common/x64Emitter.h" + +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/CPUCoreBase.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitCommon/JitAsmCommon.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitCache.h" + // Use these to control the instruction selection // #define INSTRUCTION_START Default(inst); return; // #define INSTRUCTION_START PPCTables::CountInstruction(inst); diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index 8fb7bd471b..d34bdc90b1 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -9,18 +9,17 @@ // performance hit, it's not enabled by default, but it's useful for // locating performance issues. -#include "Common.h" +#include "disasm.h" + +#include "Common/Common.h" +#include "Common/MemoryUtil.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #ifdef _WIN32 #include #endif -#include "JitBase.h" -#include "MemoryUtil.h" -#include "disasm.h" - -#include "../JitInterface.h" - #if defined USE_OPROFILE && USE_OPROFILE #include diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/PowerPC/JitCommon/JitCache.h index 143d62ea89..c9621bc689 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.h @@ -8,8 +8,8 @@ #include #include -#include "../Gekko.h" -#include "../PPCAnalyst.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCAnalyst.h" // Define this in order to get VTune profile support for the Jit generated code. // Add the VTune include/lib directories to the project directories to get this to build. diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index cd739acc8c..ec03303a97 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" -#include "CPUDetect.h" -#include "JitBase.h" -#include "Jit_Util.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitCommon/JitBase.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h index 278b9d7352..67466843ad 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h @@ -4,9 +4,10 @@ #pragma once -#include "x64Emitter.h" #include +#include "Common/x64Emitter.h" + #define MEMCHECK_START \ FixupBranch memException; \ if (jit->js.memcheck) \ diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp index 745b547a05..5470a6eaa0 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp @@ -120,16 +120,17 @@ TODO (in no particular order): #endif #include -#include #include #include +#include #include -#include "IR.h" -#include "../PPCTables.h" -#include "../../CoreTiming.h" -#include "../../HW/Memmap.h" -#include "../../HW/GPFifo.h" -#include "../../Core.h" + +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitILCommon/IR.h" using namespace Gen; namespace IREmitter { diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.h b/Source/Core/Core/PowerPC/JitILCommon/IR.h index bf0822f85f..d15b379f1c 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.h +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.h @@ -4,9 +4,10 @@ #pragma once -#include "x64Emitter.h" #include +#include "Common/x64Emitter.h" + namespace IREmitter { enum Opcode { Nop = 0, diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h index 1bc3d25f5f..24ac61b930 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h @@ -4,16 +4,16 @@ #pragma once -#include "IR.h" -#include "../PowerPC.h" -#include "../PPCAnalyst.h" -#include "../PPCTables.h" -#include "../JitCommon/JitBase.h" -#include "../../ConfigManager.h" -#include "../../Core.h" -#include "../../CoreTiming.h" -#include "../../HW/GPFifo.h" -#include "../../HW/Memmap.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitILCommon/IR.h" class JitILBase : public JitBase { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp index 6d6c594126..7a6fd16390 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" // The branches are known good, or at least reasonably good. diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp index 893bafe0d0..afa028244c 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::fp_arith_s(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp index 836cc9d45e..97eb67498f 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp @@ -6,7 +6,7 @@ #pragma warning(disable:4146) // unary minus operator applied to unsigned type, result still unsigned #endif -#include "JitILBase.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" static void ComputeRC(IREmitter::IRBuilder& ibuild, IREmitter::InstLoc val) { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp index adbf31439a..67a140c2e6 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::lhax(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp index 986489cd3f..2e4a50cd69 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" // TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common, // and pshufb could help a lot. diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp index cd2b17f758..6cc5e02b4d 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::psq_st(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp index 7ed65497c7..15cd6a2ef6 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" +#include "Common/Common.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::ps_mr(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp index 93c635839c..f171b63091 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp @@ -2,11 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "JitILBase.h" - -#include "../../HW/SystemTimers.h" - +#include "Common/Common.h" +#include "Core/HW/SystemTimers.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::mtspr(UGeckoInstruction inst) { diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 91d43a7792..6527093ea9 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -9,28 +9,27 @@ #include #endif -#include "JitInterface.h" -#include "JitCommon/JitBase.h" +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #ifndef _M_GENERIC -#include "Jit64IL/JitIL.h" -#include "Jit64/Jit.h" -#include "Jit64/Jit64_Tables.h" -#include "Jit64IL/JitIL_Tables.h" +#include "Core/PowerPC/Jit64/Jit.h" +#include "Core/PowerPC/Jit64/Jit64_Tables.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" +#include "Core/PowerPC/Jit64IL/JitIL_Tables.h" #endif #ifdef _M_ARM -#include "JitArm32/Jit.h" -#include "JitArm32/JitArm_Tables.h" -#include "JitArmIL/JitIL.h" -#include "JitArmIL/JitIL_Tables.h" +#include "Core/PowerPC/JitArm32/Jit.h" +#include "Core/PowerPC/JitArm32/JitArm_Tables.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitIL_Tables.h" #endif -#include "Profiler.h" -#include "PPCSymbolDB.h" -#include "HW/Memmap.h" -#include "ConfigManager.h" - bool bFakeVMEM = false; bool bMMU = false; diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index 2b6b970631..51fa746fa2 100644 --- a/Source/Core/Core/PowerPC/JitInterface.h +++ b/Source/Core/Core/PowerPC/JitInterface.h @@ -4,8 +4,8 @@ #pragma once -#include "ChunkFile.h" -#include "CPUCoreBase.h" +#include "Common/ChunkFile.h" +#include "Core/PowerPC/CPUCoreBase.h" namespace JitInterface { diff --git a/Source/Core/Core/PowerPC/LUT_frsqrtex.cpp b/Source/Core/Core/PowerPC/LUT_frsqrtex.cpp index 89aaf33eb2..4f11bcfc2f 100644 --- a/Source/Core/Core/PowerPC/LUT_frsqrtex.cpp +++ b/Source/Core/Core/PowerPC/LUT_frsqrtex.cpp @@ -5,7 +5,7 @@ // Gekko related unions, structs, ... -#include "LUT_frsqrtex.h" +#include "Core/PowerPC/LUT_frsqrtex.h" const unsigned int frsqrtex_lut[65536] = { 0x69FA0000, 0x69F8A600, 0x69F74C00, diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index b1fddf0514..00925de131 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -2,19 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include -#include "StringUtil.h" -#include "Interpreter/Interpreter.h" -#include "../HW/Memmap.h" -#include "JitInterface.h" -#include "PPCTables.h" -#include "PPCSymbolDB.h" -#include "SignatureDB.h" -#include "PPCAnalyst.h" -#include "../ConfigManager.h" -#include "../GeckoCode.h" +#include "Common/StringUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/GeckoCode.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/SignatureDB.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" // Analyzes PowerPC code in memory to find functions // After running, for each function we will know what functions it calls diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.h b/Source/Core/Core/PowerPC/PPCAnalyst.h index 21b192f514..9f898f57ca 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.h +++ b/Source/Core/Core/PowerPC/PPCAnalyst.h @@ -5,14 +5,13 @@ #pragma once #include -#include -#include - #include +#include #include +#include -#include "Common.h" -#include "PPCTables.h" +#include "Common/Common.h" +#include "Core/PowerPC/PPCTables.h" class PPCSymbolDB; struct Symbol; diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 0785e37943..3ccd6f683f 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "PPCCache.h" -#include "../HW/Memmap.h" -#include "PowerPC.h" -#include "JitCommon/JitBase.h" -#include "JitCommon/JitCache.h" -#include "JitInterface.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCCache.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" namespace PowerPC { diff --git a/Source/Core/Core/PowerPC/PPCCache.h b/Source/Core/Core/PowerPC/PPCCache.h index b38692d728..de4b2cacae 100644 --- a/Source/Core/Core/PowerPC/PPCCache.h +++ b/Source/Core/Core/PowerPC/PPCCache.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" #define FAST_ICACHE diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index eb5b65a49e..cb8f0f0775 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -6,16 +6,17 @@ #include #include -#include "Common.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "Core/Host.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/SignatureDB.h" -#include "../HW/Memmap.h" -#include "../PowerPC/PowerPC.h" -#include "../Host.h" -#include "StringUtil.h" -#include "PPCSymbolDB.h" -#include "SignatureDB.h" -#include "PPCAnalyst.h" PPCSymbolDB g_symbolDB; diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h index fc732575c2..b40ef70050 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.h +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h @@ -4,14 +4,14 @@ #pragma once -#include "CommonTypes.h" - #include #include #include -#include "../Debugger/PPCDebugInterface.h" -#include "SymbolDB.h" +#include "Common/CommonTypes.h" +#include "Common/SymbolDB.h" + +#include "Core/Debugger/PPCDebugInterface.h" // This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later. class PPCSymbolDB : public SymbolDB diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index bda18339d5..264fe5f4e3 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -3,16 +3,17 @@ // Refer to the license.txt file included. #include -#include #include +#include -#include "Common.h" -#include "PPCTables.h" -#include "StringUtil.h" -#include "FileUtil.h" -#include "Interpreter/Interpreter.h" -#include "Interpreter/Interpreter_Tables.h" -#include "JitInterface.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_Tables.h" GekkoOPInfo *m_infoTable[64]; GekkoOPInfo *m_infoTable4[1024]; diff --git a/Source/Core/Core/PowerPC/PPCTables.h b/Source/Core/Core/PowerPC/PPCTables.h index b54260f3cd..82fcc9e8ca 100644 --- a/Source/Core/Core/PowerPC/PPCTables.h +++ b/Source/Core/Core/PowerPC/PPCTables.h @@ -4,8 +4,8 @@ #pragma once -#include "Gekko.h" -#include "Interpreter/Interpreter.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" enum { diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 00ecfaf443..bf03584516 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -2,25 +2,25 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "Atomic.h" -#include "MathUtil.h" -#include "ChunkFile.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" -#include "../HW/Memmap.h" -#include "../HW/CPU.h" -#include "../Core.h" -#include "../CoreTiming.h" -#include "../HW/SystemTimers.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Host.h" +#include "Core/HW/CPU.h" +#include "Core/HW/EXI.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/SystemTimers.h" -#include "Interpreter/Interpreter.h" -#include "PowerPC.h" -#include "PPCTables.h" -#include "CPUCoreBase.h" -#include "JitInterface.h" +#include "Core/PowerPC/CPUCoreBase.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" -#include "../Host.h" -#include "HW/EXI.h" CPUCoreBase *cpu_core_base; diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 745181c8af..12295cf2cb 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -4,12 +4,13 @@ #pragma once -#include "Common.h" -#include "CPUCoreBase.h" -#include "Gekko.h" -#include "BreakPoints.h" -#include "../Debugger/PPCDebugInterface.h" -#include "PPCCache.h" +#include "Common/BreakPoints.h" +#include "Common/Common.h" + +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/PowerPC/CPUCoreBase.h" +#include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/PPCCache.h" class PointerWrap; diff --git a/Source/Core/Core/PowerPC/Profiler.cpp b/Source/Core/Core/PowerPC/Profiler.cpp index 77da606e52..59a7535d3a 100644 --- a/Source/Core/Core/PowerPC/Profiler.cpp +++ b/Source/Core/Core/PowerPC/Profiler.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "JitInterface.h" +#include "Core/PowerPC/JitInterface.h" namespace Profiler { diff --git a/Source/Core/Core/PowerPC/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB.cpp index 82474fc03f..1d21ddc538 100644 --- a/Source/Core/Core/PowerPC/SignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB.cpp @@ -2,13 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "PPCAnalyst.h" -#include "../HW/Memmap.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" -#include "SignatureDB.h" -#include "PPCSymbolDB.h" +#include "Core/HW/Memmap.h" + +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/SignatureDB.h" namespace { diff --git a/Source/Core/Core/PowerPC/SignatureDB.h b/Source/Core/Core/PowerPC/SignatureDB.h index 4d0e451d18..9d1029b61b 100644 --- a/Source/Core/Core/PowerPC/SignatureDB.h +++ b/Source/Core/Core/PowerPC/SignatureDB.h @@ -4,11 +4,11 @@ #pragma once -#include "CommonTypes.h" - #include #include +#include "Common/CommonTypes.h" + // You're not meant to keep around SignatureDB objects persistently. Use 'em, throw them away. class PPCSymbolDB; diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index bc1069abc3..a1eecd3312 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -2,26 +2,28 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "Timer.h" -#include "State.h" -#include "Core.h" -#include "ConfigManager.h" -#include "StringUtil.h" -#include "Thread.h" -#include "CoreTiming.h" -#include "Movie.h" -#include "HW/Wiimote.h" -#include "HW/DSP.h" -#include "HW/HW.h" -#include "HW/CPU.h" -#include "PowerPC/JitCommon/JitBase.h" -#include "VideoBackendBase.h" - #include -#include "HW/Memmap.h" -#include "HW/VideoInterface.h" -#include "HW/SystemTimers.h" + +#include "Common/Common.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/Movie.h" +#include "Core/State.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/HW.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/SystemTimers.h" +#include "Core/HW/VideoInterface.h" +#include "Core/HW/Wiimote.h" +#include "Core/PowerPC/JitCommon/JitBase.h" + +#include "VideoCommon/VideoBackendBase.h" namespace State { diff --git a/Source/Core/Core/Tracer.cpp b/Source/Core/Core/Tracer.cpp index a57d40b006..787b66f58d 100644 --- a/Source/Core/Core/Tracer.cpp +++ b/Source/Core/Core/Tracer.cpp @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include -#include "Common.h" -#include "Tracer.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" -#include "Host.h" - -#include "PowerPC/PowerPC.h" +#include "Core/Host.h" +#include "Core/Tracer.h" +#include "Core/PowerPC/PowerPC.h" namespace Core { diff --git a/Source/Core/Core/VolumeHandler.cpp b/Source/Core/Core/VolumeHandler.cpp index 5ceba836e5..d1c8d4cb96 100644 --- a/Source/Core/Core/VolumeHandler.cpp +++ b/Source/Core/Core/VolumeHandler.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VolumeHandler.h" -#include "VolumeCreator.h" +#include "Core/VolumeHandler.h" +#include "DiscIO/VolumeCreator.h" namespace VolumeHandler { diff --git a/Source/Core/Core/VolumeHandler.h b/Source/Core/Core/VolumeHandler.h index ca47074bb0..2a6e8f9b90 100644 --- a/Source/Core/Core/VolumeHandler.h +++ b/Source/Core/Core/VolumeHandler.h @@ -9,8 +9,9 @@ #pragma once #include -#include "CommonTypes.h" -#include "Volume.h" + +#include "Common/CommonTypes.h" +#include "DiscIO/Volume.h" namespace VolumeHandler { diff --git a/Source/Core/Core/ec_wii.cpp b/Source/Core/Core/ec_wii.cpp index f512d827eb..d89e17f71d 100644 --- a/Source/Core/Core/ec_wii.cpp +++ b/Source/Core/Core/ec_wii.cpp @@ -7,13 +7,15 @@ // Licensed under the terms of the GNU GPL, version 2 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -#include +#include #include -#include "Common.h" -#include "polarssl/sha1.h" -#include "Crypto/tools.h" -#include "FileUtil.h" -#include "ec_wii.h" + +#include + +#include "Common/FileUtil.h" +#include "Common/Crypto/tools.h" + +#include "Core/ec_wii.h" static u32 default_NG_id = 0x0403AC68; static u32 default_NG_key_id = 0x6AAB8C59; diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index 56d09ae0b4..b99511432e 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -24,7 +24,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig); void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id); diff --git a/Source/Core/Core/x64MemTools.cpp b/Source/Core/Core/x64MemTools.cpp index a5ed163df7..5c65695aed 100644 --- a/Source/Core/Core/x64MemTools.cpp +++ b/Source/Core/Core/x64MemTools.cpp @@ -2,22 +2,23 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#ifdef __APPLE__ -#include "Thread.h" -#endif - +#include #include -#include "Common.h" -#include "MemTools.h" -#include "HW/Memmap.h" -#include "PowerPC/PowerPC.h" -#include "PowerPC/JitInterface.h" -#ifndef _M_GENERIC -#include "PowerPC/JitCommon/JitBase.h" +#ifdef __APPLE__ +#include "Common/Thread.h" +#endif + +#include "Common/Common.h" +#include "Common/x64Analyzer.h" + +#include "Core/MemTools.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#ifndef _M_GENERIC +#include "Core/PowerPC/JitCommon/JitBase.h" #endif -#include "x64Analyzer.h" namespace EMM { diff --git a/Source/Core/DiscIO/BannerLoader.cpp b/Source/Core/DiscIO/BannerLoader.cpp index 11f9697ba9..d0c59c567d 100644 --- a/Source/Core/DiscIO/BannerLoader.cpp +++ b/Source/Core/DiscIO/BannerLoader.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "BannerLoader.h" -#include "BannerLoaderWii.h" -#include "BannerLoaderGC.h" +#include "Common/FileUtil.h" -#include "VolumeCreator.h" -#include "FileUtil.h" +#include "DiscIO/BannerLoader.h" +#include "DiscIO/BannerLoaderGC.h" +#include "DiscIO/BannerLoaderWii.h" +#include "DiscIO/VolumeCreator.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoader.h b/Source/Core/DiscIO/BannerLoader.h index 0d341931e0..d291f7fb6c 100644 --- a/Source/Core/DiscIO/BannerLoader.h +++ b/Source/Core/DiscIO/BannerLoader.h @@ -4,10 +4,10 @@ #pragma once -#include #include +#include -#include "Filesystem.h" +#include "DiscIO/Filesystem.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp index ce35258148..bc6ba3470b 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/BannerLoaderGC.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonTypes.h" -#include "ColorUtil.h" -#include "BannerLoaderGC.h" +#include "Common/ColorUtil.h" +#include "Common/CommonTypes.h" +#include "DiscIO/BannerLoaderGC.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderGC.h b/Source/Core/DiscIO/BannerLoaderGC.h index 5242600525..d4d26d8974 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.h +++ b/Source/Core/DiscIO/BannerLoaderGC.h @@ -4,9 +4,10 @@ #pragma once -#include "BannerLoader.h" -#include "VolumeGC.h" -#include "StringUtil.h" +#include "Common/StringUtil.h" + +#include "DiscIO/BannerLoader.h" +#include "DiscIO/VolumeGC.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp index 15c4325748..a037a830bd 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/BannerLoaderWii.cpp @@ -2,15 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include -#include "CommonTypes.h" -#include "ColorUtil.h" -#include "BannerLoaderWii.h" -#include "VolumeCreator.h" -#include "FileUtil.h" -#include "FileHandlerARC.h" +#include "Common/ColorUtil.h" +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" + +#include "DiscIO/BannerLoaderWii.h" +#include "DiscIO/FileHandlerARC.h" +#include "DiscIO/VolumeCreator.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderWii.h b/Source/Core/DiscIO/BannerLoaderWii.h index bfc8f7c975..45cbb136ce 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.h +++ b/Source/Core/DiscIO/BannerLoaderWii.h @@ -4,7 +4,7 @@ #pragma once -#include "BannerLoader.h" +#include "DiscIO/BannerLoader.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index 600b9e0a4b..f8a831d95b 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Blob.h" -#include "CDUtils.h" -#include "CISOBlob.h" -#include "CompressedBlob.h" -#include "DriveBlob.h" -#include "FileBlob.h" -#include "FileUtil.h" -#include "WbfsBlob.h" +#include "Common/CDUtils.h" +#include "Common/FileUtil.h" + +#include "DiscIO/Blob.h" +#include "DiscIO/CISOBlob.h" +#include "DiscIO/CompressedBlob.h" +#include "DiscIO/DriveBlob.h" +#include "DiscIO/FileBlob.h" +#include "DiscIO/WbfsBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h index 5fdfe26e0e..c93d47c984 100644 --- a/Source/Core/DiscIO/Blob.h +++ b/Source/Core/DiscIO/Blob.h @@ -14,7 +14,7 @@ // detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and // automatically do the right thing. -#include "CommonTypes.h" +#include "Common/CommonTypes.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index 5070c8e796..4bf97aed2f 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -5,8 +5,8 @@ #include #include -#include "Blob.h" -#include "CISOBlob.h" +#include "DiscIO/Blob.h" +#include "DiscIO/CISOBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h index 5cd016683a..26f2a84ffd 100644 --- a/Source/Core/DiscIO/CISOBlob.h +++ b/Source/Core/DiscIO/CISOBlob.h @@ -4,8 +4,8 @@ #pragma once -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index ac3050fd6f..f3dd250b78 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -10,13 +10,13 @@ #endif #include +#include -#include "CompressedBlob.h" -#include "DiscScrubber.h" -#include "FileUtil.h" -#include "Hash.h" +#include "Common/FileUtil.h" +#include "Common/Hash.h" +#include "DiscIO/CompressedBlob.h" +#include "DiscIO/DiscScrubber.h" -#include "zlib.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h index 2d201deae6..a170239e4b 100644 --- a/Source/Core/DiscIO/CompressedBlob.h +++ b/Source/Core/DiscIO/CompressedBlob.h @@ -16,8 +16,8 @@ #include -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index a992d23a3a..b1274987cc 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Filesystem.h" -#include "VolumeCreator.h" -#include "FileUtil.h" -#include "DiscScrubber.h" - #include +#include "Common/FileUtil.h" +#include "DiscIO/DiscScrubber.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" + namespace DiscIO { diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h index c1efacb8c1..5b29fda9b7 100644 --- a/Source/Core/DiscIO/DiscScrubber.h +++ b/Source/Core/DiscIO/DiscScrubber.h @@ -13,8 +13,8 @@ #pragma once -#include "CommonTypes.h" -#include "Blob.h" +#include "Common/CommonTypes.h" +#include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index 017cd702bc..ad0a72a194 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DriveBlob.h" -#include "StringUtil.h" +#include "Common/StringUtil.h" +#include "DiscIO/DriveBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index 5f4a70a6fa..1e70859702 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -4,8 +4,8 @@ #pragma once -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" #ifdef _WIN32 #include diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp index 42ea73c78d..d97a4b1d7c 100644 --- a/Source/Core/DiscIO/FileBlob.cpp +++ b/Source/Core/DiscIO/FileBlob.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileBlob.h" +#include "DiscIO/FileBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h index 21778a0605..cafa07412e 100644 --- a/Source/Core/DiscIO/FileBlob.h +++ b/Source/Core/DiscIO/FileBlob.h @@ -4,8 +4,8 @@ #pragma once -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp index 26ec6ec9ec..8e820e65b2 100644 --- a/Source/Core/DiscIO/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/FileHandlerARC.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileHandlerARC.h" -#include "StringUtil.h" -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" +#include "DiscIO/Blob.h" +#include "DiscIO/FileHandlerARC.h" #define ARC_ID 0x55aa382d diff --git a/Source/Core/DiscIO/FileHandlerARC.h b/Source/Core/DiscIO/FileHandlerARC.h index 93f5bded1c..23ff978b35 100644 --- a/Source/Core/DiscIO/FileHandlerARC.h +++ b/Source/Core/DiscIO/FileHandlerARC.h @@ -7,8 +7,8 @@ #include #include -#include "CommonTypes.h" -#include "Filesystem.h" +#include "Common/CommonTypes.h" +#include "DiscIO/Filesystem.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index ae2f9c0f99..bae2f49964 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -2,20 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include -#include #include +#include +#include +#include +#include "Common/Common.h" +#include "Common/IniFile.h" +#include "Common/LogManager.h" -#include "Common.h" -#include "IniFile.h" -#include "LogManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" -#include "../Core/Core.h" -#include "../Core/ConfigManager.h" -#include "FileSystemGCWii.h" -#include "VolumeCreator.h" +#include "DiscIO/FileSystemGCWii.h" +#include "DiscIO/VolumeCreator.h" namespace FileMon { diff --git a/Source/Core/DiscIO/FileMonitor.h b/Source/Core/DiscIO/FileMonitor.h index 2b3559766b..2ce4af3a53 100644 --- a/Source/Core/DiscIO/FileMonitor.h +++ b/Source/Core/DiscIO/FileMonitor.h @@ -6,7 +6,7 @@ #include // System: For std -#include "Common.h" // Common: For u64 +#include "Common/Common.h" // Common: For u64 namespace FileMon diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index c8d5c2b198..078fb554cc 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -2,16 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FileUtil.h" - -#include -#include #include #include +#include +#include -#include "FileSystemGCWii.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "DiscIO/FileSystemGCWii.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index af8040dc3d..7444711293 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -6,7 +6,7 @@ #include -#include "Filesystem.h" +#include "DiscIO/Filesystem.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp index cdf6288a54..fc07bae1ac 100644 --- a/Source/Core/DiscIO/Filesystem.cpp +++ b/Source/Core/DiscIO/Filesystem.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Filesystem.h" - -#include "VolumeCreator.h" -#include "FileSystemGCWii.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/FileSystemGCWii.h" +#include "DiscIO/VolumeCreator.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index 10b85e2635..b67f0d447e 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -4,7 +4,7 @@ #pragma once -#include "Volume.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index 5f2f9af19e..35d51a56e1 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NANDContentLoader.h" - #include #include #include -#include "MathUtil.h" -#include "FileUtil.h" -#include "Log.h" -#include "WiiWad.h" -#include "StringUtil.h" + +#include "Common/FileUtil.h" +#include "Common/Log.h" +#include "Common/MathUtil.h" +#include "Common/StringUtil.h" + +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/WiiWad.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index fa517cae64..bff92974e5 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -4,15 +4,16 @@ #pragma once +#include #include #include -#include -#include "Common.h" -#include "Blob.h" -#include "Volume.h" -#include "NandPaths.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/NandPaths.h" + +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 92112be609..5343a9f1fd 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -7,8 +7,8 @@ #include #include -#include "Common.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index ad5a226ef7..af367c790f 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Volume.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 4a47d79b72..74d4a5d99a 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -6,16 +6,16 @@ #include -#include "VolumeCreator.h" +#include "Common/Hash.h" +#include "Common/StringUtil.h" -#include "Volume.h" -#include "VolumeDirectory.h" -#include "VolumeGC.h" -#include "VolumeWiiCrypted.h" -#include "VolumeWad.h" +#include "DiscIO/Volume.h" +#include "DiscIO/VolumeCreator.h" +#include "DiscIO/VolumeDirectory.h" +#include "DiscIO/VolumeGC.h" +#include "DiscIO/VolumeWad.h" +#include "DiscIO/VolumeWiiCrypted.h" -#include "Hash.h" -#include "StringUtil.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeCreator.h b/Source/Core/DiscIO/VolumeCreator.h index a92ec2ef8e..a9f1e43da2 100644 --- a/Source/Core/DiscIO/VolumeCreator.h +++ b/Source/Core/DiscIO/VolumeCreator.h @@ -4,7 +4,7 @@ #pragma once -#include "Volume.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 6f8141af13..eeaa5fe366 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonPaths.h" -#include "FileBlob.h" -#include "MathUtil.h" -#include "VolumeDirectory.h" +#include "Common/CommonPaths.h" +#include "Common/MathUtil.h" + +#include "DiscIO/FileBlob.h" +#include "DiscIO/VolumeDirectory.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h index c6a387b686..4f9a47ff9c 100644 --- a/Source/Core/DiscIO/VolumeDirectory.h +++ b/Source/Core/DiscIO/VolumeDirectory.h @@ -7,8 +7,8 @@ #include #include -#include "FileUtil.h" -#include "Volume.h" +#include "Common/FileUtil.h" +#include "DiscIO/Volume.h" // // --- this volume type is used for reading files directly from the hard drive --- diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index f2d97462e9..8039d56922 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VolumeGC.h" -#include "StringUtil.h" -#include "FileMonitor.h" +#include "Common/StringUtil.h" +#include "DiscIO/FileMonitor.h" +#include "DiscIO/VolumeGC.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index 0ace9eaaa7..42b7524269 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -4,8 +4,8 @@ #pragma once -#include "Volume.h" -#include "Blob.h" +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" // --- this volume type is used for GC disc images --- diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index cc50ec8c66..d436c9935a 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -3,11 +3,11 @@ // Refer to the license.txt file included. #include -#include +#include -#include "VolumeWad.h" -#include "StringUtil.h" -#include "MathUtil.h" +#include "Common/MathUtil.h" +#include "Common/StringUtil.h" +#include "DiscIO/VolumeWad.h" #define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40) diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h index 892b2c0fbf..7ae0068524 100644 --- a/Source/Core/DiscIO/VolumeWad.h +++ b/Source/Core/DiscIO/VolumeWad.h @@ -4,9 +4,9 @@ #pragma once -#include "Volume.h" -#include "Blob.h" -#include "NANDContentLoader.h" +#include "DiscIO/Blob.h" +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/Volume.h" // --- this volume type is used for Wad files --- // Some of this code might look redundant with the CNANDContentLoader class, however, diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index c6666ca029..69b78690e9 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VolumeWiiCrypted.h" -#include "VolumeGC.h" -#include "StringUtil.h" #include +#include "Common/StringUtil.h" +#include "DiscIO/VolumeGC.h" +#include "DiscIO/VolumeWiiCrypted.h" + namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index 04401778d7..51033b1e5e 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -4,10 +4,11 @@ #pragma once -#include "Volume.h" -#include "Blob.h" #include +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" + // --- this volume type is used for encrypted Wii images --- namespace DiscIO diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 50b3c78918..a13e268123 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "WbfsBlob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/WbfsBlob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h index 0ac4ecf845..83ac436ddd 100644 --- a/Source/Core/DiscIO/WbfsBlob.h +++ b/Source/Core/DiscIO/WbfsBlob.h @@ -4,8 +4,8 @@ #pragma once -#include "Blob.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "DiscIO/Blob.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 783ede511d..8c6cda77bd 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NANDContentLoader.h" #include #include -#include "MathUtil.h" -#include "FileUtil.h" -#include "Log.h" -#include "WiiWad.h" + +#include "Common/FileUtil.h" +#include "Common/Log.h" +#include "Common/MathUtil.h" +#include "DiscIO/NANDContentLoader.h" +#include "DiscIO/WiiWad.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h index cde73495e2..b72f616149 100644 --- a/Source/Core/DiscIO/WiiWad.h +++ b/Source/Core/DiscIO/WiiWad.h @@ -4,13 +4,13 @@ #pragma once +#include #include #include -#include -#include "CommonTypes.h" -#include "Blob.h" -#include "Volume.h" +#include "Common/CommonTypes.h" +#include "DiscIO/Blob.h" +#include "DiscIO/Volume.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/stdafx.cpp b/Source/Core/DiscIO/stdafx.cpp index 89b047311e..8ab4b84b8f 100644 --- a/Source/Core/DiscIO/stdafx.cpp +++ b/Source/Core/DiscIO/stdafx.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "DiscIO/stdafx.h" // TODO: reference any additional headers you need in STDAFX.H // and not in this file diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index fd6b9add77..0143e153fe 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ARCodeAddEdit.h" -#include "ARDecrypt.h" -#include "WxUtils.h" +#include "Core/ARDecrypt.h" +#include "DolphinWX/ARCodeAddEdit.h" +#include "DolphinWX/WxUtils.h" extern std::vector arCodes; diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h index e621308613..9f22a0c2f4 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/ARCodeAddEdit.h @@ -4,9 +4,10 @@ #pragma once -#include #include -#include "ISOProperties.h" +#include + +#include "DolphinWX/ISOProperties.h" class CARCodeAddEdit : public wxDialog { diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index d1971855ea..c17c219b11 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "AboutDolphin.h" -#include "WxUtils.h" -#include "resources/dolphin_logo.cpp" +#include "Common/Common.h" +#include "DolphinWX/AboutDolphin.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/resources/dolphin_logo.cpp" AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h index c9fd71495f..4c1f43053d 100644 --- a/Source/Core/DolphinWX/AboutDolphin.h +++ b/Source/Core/DolphinWX/AboutDolphin.h @@ -4,13 +4,13 @@ #pragma once -#include -#include #include -#include -#include +#include #include #include +#include +#include +#include class AboutDolphin : public wxDialog { diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 257237252f..a8ebafdd20 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -1,23 +1,11 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include -#include "GLInterface/GLInterface.h" -#include "Android/ButtonManager.h" + +#include "DolphinWX/Android/ButtonManager.h" +#include "DolphinWX/GLInterface/GLInterface.h" namespace ButtonManager { diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h index 07b3bfffbd..f56157d7d1 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.h +++ b/Source/Core/DolphinWX/Android/ButtonManager.h @@ -1,26 +1,13 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #pragma once -#include #include -#include "CommonPaths.h" -#include "VideoBackendBase.h" +#include +#include "Common/CommonPaths.h" +#include "VideoCommon/VideoBackendBase.h" namespace ButtonManager { diff --git a/Source/Core/DolphinWX/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index a1ed7c6fe5..398b981fc4 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" -#include "CheatsWindow.h" -#include "ActionReplay.h" -#include "CommonPaths.h" -#include "Core.h" -#include "ConfigManager.h" -#include "VolumeHandler.h" -#include "ISOProperties.h" -#include "HW/Memmap.h" -#include "Frame.h" -#include "WxUtils.h" +#include "Common/CommonPaths.h" +#include "Core/ActionReplay.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/Memmap.h" +#include "DolphinWX/CheatsWindow.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/ISOProperties.h" +#include "DolphinWX/WxUtils.h" + #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY 256 extern std::vector arCodes; diff --git a/Source/Core/DolphinWX/CheatsWindow.h b/Source/Core/DolphinWX/CheatsWindow.h index a4a654d601..d7823a982c 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -4,28 +4,25 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "ActionReplay.h" - -#include "GeckoCodeDiag.h" - -#include "Filesystem.h" -#include "IniFile.h" +#include "Common/IniFile.h" +#include "Core/ActionReplay.h" +#include "DiscIO/Filesystem.h" +#include "DolphinWX/GeckoCodeDiag.h" class CreateCodeDialog : public wxDialog { diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 4bf477d4fe..62e41de79d 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -2,35 +2,37 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include // System -#include #include #include +#include +#include #include -#include "Common.h" -#include "CommonPaths.h" -#include "FileSearch.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileSearch.h" +#include "Common/SysConf.h" -#include "Core.h" // Core -#include "HW/EXI.h" -#include "HW/SI.h" -#include "HW/DSPHLE/DSPHLE.h" -#include "HW/DSPLLE/DSPLLE.h" -#include "HW/GCMemcard.h" -#include "IPC_HLE/WII_IPC_HLE.h" -#include "NANDContentLoader.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/NetPlayProto.h" +#include "Core/HW/EXI.h" +#include "Core/HW/GCMemcard.h" +#include "Core/HW/SI.h" +#include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPLLE/DSPLLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" -#include "WxUtils.h" -#include "Globals.h" // Local -#include "ConfigMain.h" -#include "ConfigManager.h" -#include "SysConf.h" -#include "Frame.h" -#include "HotkeyDlg.h" -#include "Main.h" -#include "VideoBackendBase.h" -#include "NetPlayProto.h" +#include "DiscIO/NANDContentLoader.h" + +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/HotkeyDlg.h" +#include "DolphinWX/Main.h" +#include "DolphinWX/WxUtils.h" + +#include "VideoCommon/VideoBackendBase.h" #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 93c545d87a..9aafeedf0e 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -4,14 +4,16 @@ #pragma once -#include -#include -#include -#include #include -#include "ConfigManager.h" +#include +#include +#include +#include +#include + +#include "Core/ConfigManager.h" #if defined(HAVE_XRANDR) && HAVE_XRANDR -#include "X11Utils.h" +#include "DolphinWX/X11Utils.h" #endif class CConfigMain : public wxDialog diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index 64348e3cd4..047464e044 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "BreakpointDlg.h" -#include "StringUtil.h" -#include "PowerPC/PowerPC.h" -#include "BreakpointWindow.h" -#include "../WxUtils.h" +#include "Common/StringUtil.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/BreakpointDlg.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog) EVT_BUTTON(wxID_OK, BreakPointDlg::OnOK) diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp index c23412e7ad..4934122ee0 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp @@ -4,13 +4,13 @@ #include -#include "BreakpointView.h" -#include "DebuggerUIUtil.h" -#include "Debugger/Debugger_SymbolMap.h" -#include "PowerPC/PPCSymbolDB.h" -#include "PowerPC/PowerPC.h" -#include "HW/Memmap.h" -#include "../WxUtils.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/BreakpointView.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id) : wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize, diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Debugger/BreakpointView.h index 564760fd16..e53eacd20a 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.h @@ -5,7 +5,8 @@ #pragma once #include -#include "Common.h" + +#include "Common/Common.h" class CBreakPointView : public wxListCtrl { diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp index a83db3abe0..8afc73fab0 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "BreakpointWindow.h" -#include "BreakpointView.h" -#include "CodeWindow.h" -#include "HW/Memmap.h" -#include "BreakpointDlg.h" -#include "MemoryCheckDlg.h" -#include "PowerPC/PowerPC.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/Debugger/BreakpointDlg.h" +#include "DolphinWX/Debugger/BreakpointView.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/MemoryCheckDlg.h" extern "C" { -#include "../resources/toolbar_add_breakpoint.c" -#include "../resources/toolbar_add_memorycheck.c" -#include "../resources/toolbar_debugger_delete.c" +#include "DolphinWX/resources/toolbar_add_breakpoint.c" +#include "DolphinWX/resources/toolbar_add_memorycheck.c" +#include "DolphinWX/resources/toolbar_debugger_delete.c" } class CBreakPointBar : public wxAuiToolBar diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h index 9efccb7149..6e8235be0a 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include class CBreakPointView; diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index b4d6c4378d..9dc5237461 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp @@ -2,20 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "StringUtil.h" -#include "DebuggerUIUtil.h" -#include "DebugInterface.h" - -#include "Host.h" -#include "CodeView.h" -#include "SymbolDB.h" -#include "../WxUtils.h" - -#include #include +#include #include +#include "Common/Common.h" +#include "Common/DebugInterface.h" +#include "Common/StringUtil.h" +#include "Common/SymbolDB.h" +#include "Core/Host.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/CodeView.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" + DEFINE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE); enum diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h index 18bed46557..8d41e5eb3e 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.h +++ b/Source/Core/DolphinWX/Debugger/CodeView.h @@ -7,11 +7,11 @@ #define wxUSE_XPM_IN_MSW 1 #define USE_XPM_BITMAPS 1 +#include + #include -#include "Common.h" - -#include +#include "Common/Common.h" DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1); diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 1720dcb887..8e58eaa152 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -2,44 +2,39 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -// Include -#include "Common.h" - #include -#include "Host.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Boot/Boot.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/CPU.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/SignatureDB.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" +#include "DolphinWX/Debugger/CodeView.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/JitWindow.h" +#include "DolphinWX/Debugger/MemoryWindow.h" +#include "DolphinWX/Debugger/RegisterWindow.h" -#include "RegisterWindow.h" -#include "BreakpointWindow.h" -#include "MemoryWindow.h" -#include "JitWindow.h" - -#include "CodeWindow.h" -#include "CodeView.h" - -#include "../WxUtils.h" -#include "FileUtil.h" -#include "Core.h" -#include "HW/Memmap.h" -#include "HLE/HLE.h" -#include "Boot/Boot.h" -#include "LogManager.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "PowerPC/JitInterface.h" -#include "Debugger/PPCDebugInterface.h" -#include "Debugger/Debugger_SymbolMap.h" -#include "PowerPC/PPCAnalyst.h" -#include "PowerPC/PPCSymbolDB.h" -#include "PowerPC/SignatureDB.h" -#include "PowerPC/PPCTables.h" - -#include "ConfigManager.h" extern "C" // Bitmaps { - #include "../resources/toolbar_add_memorycheck.c" - #include "../resources/toolbar_add_breakpoint.c" + #include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT + #include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT } // ------- diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 5ab2c90258..1dd52871b4 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -4,17 +4,15 @@ #pragma once -#include -#include -#include #include +#include +#include +#include -#include "Thread.h" -#include "CoreParameter.h" - -// GUI global -#include "../Globals.h" -#include "../Frame.h" +#include "Common/Thread.h" +#include "Core/CoreParameter.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/Globals.h" class CFrame; class CRegisterWindow; diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index 14a1e3e1e8..0de5320038 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -2,45 +2,42 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CommonPaths.h" - #include #include -#include "Host.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" -#include "DebuggerUIUtil.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Boot/Boot.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/CPU.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/SignatureDB.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" // for ClearCache() -#include "../WxUtils.h" -#include "RegisterWindow.h" -#include "BreakpointWindow.h" -#include "MemoryWindow.h" -#include "JitWindow.h" -#include "DebuggerPanel.h" -#include "DSPDebugWindow.h" -#include "FileUtil.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" +#include "DolphinWX/Debugger/CodeView.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/DebuggerPanel.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" +#include "DolphinWX/Debugger/DSPDebugWindow.h" +#include "DolphinWX/Debugger/JitWindow.h" +#include "DolphinWX/Debugger/MemoryWindow.h" +#include "DolphinWX/Debugger/RegisterWindow.h" -#include "CodeWindow.h" -#include "CodeView.h" - -#include "Core.h" -#include "HLE/HLE.h" -#include "Boot/Boot.h" -#include "LogManager.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "Debugger/PPCDebugInterface.h" -#include "Debugger/Debugger_SymbolMap.h" -#include "PowerPC/PPCAnalyst.h" -#include "PowerPC/Profiler.h" -#include "PowerPC/PPCSymbolDB.h" -#include "PowerPC/SignatureDB.h" -#include "PowerPC/PPCTables.h" -#include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitCache.h" // for ClearCache() - -#include "ConfigManager.h" // Save and load settings // ----------------------------- diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 3a120cacb8..681209c39c 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -2,20 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include #include +#include #include - #include -#include "../WxUtils.h" -#include "StringUtil.h" -#include "DSPDebugWindow.h" -#include "DSPRegisterView.h" -#include "CodeView.h" -#include "MemoryView.h" -#include "HW/DSPLLE/DSPSymbols.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/CodeView.h" +#include "DolphinWX/Debugger/DSPDebugWindow.h" +#include "DolphinWX/Debugger/DSPRegisterView.h" +#include "DolphinWX/Debugger/MemoryView.h" DSPDebuggerLLE* m_DebuggerFrame = NULL; diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h index 3f71321fb0..e0bf61f8da 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -5,26 +5,25 @@ #pragma once // general things +#include #include -#include #include #include -#include - -#include -#include +#include #include -#include -#include -#include +#include #include +#include +#include #include +#include +#include #include -#include "DSP/disassemble.h" -#include "DSP/DSPInterpreter.h" -#include "DSP/DSPMemoryMap.h" -#include "HW/DSPLLE/DSPDebugInterface.h" +#include "Core/DSP/disassemble.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" +#include "Core/HW/DSPLLE/DSPDebugInterface.h" class DSPRegisterView; class CCodeView; diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp index b3ad7dde8a..8adbb32222 100644 --- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DSPDebugWindow.h" -#include "DSPRegisterView.h" -#include "../WxUtils.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/DSPDebugWindow.h" +#include "DolphinWX/Debugger/DSPRegisterView.h" wxString CDSPRegTable::GetValue(int row, int col) { diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp index d37ca2e6d1..bc28c6ccfb 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp @@ -2,16 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "IniFile.h" -#include "DebuggerPanel.h" -#include "FileUtil.h" -#include "../../Core/ConfigManager.h" - -#include "VideoConfig.h" -#include "TextureCacheBase.h" -#include "PixelShaderGen.h" -#include "VertexShaderGen.h" -#include "NativeVertexFormat.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Core/ConfigManager.h" +#include "DolphinWX/Debugger/DebuggerPanel.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VideoConfig.h" BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel) EVT_CLOSE(GFXDebuggerPanel::OnClose) diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index 3cc55746fd..cdf5144be3 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -4,9 +4,10 @@ #pragma once -#include #include -#include "Debugger.h" +#include + +#include "VideoCommon/Debugger.h" class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase { diff --git a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp index db14859ff0..406d23910e 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. -#include "DebuggerUIUtil.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" // The default font wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace")); diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index cb3c263660..5e3511b8cd 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -2,30 +2,26 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include // Bochs +#include // Bochs #include +#include #include -#include #include -#include -#include "JitWindow.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitCache.h" -#include "PowerPC/PPCAnalyst.h" -#include "PowerPCDisasm.h" -#include "disasm.h" - -#include "Debugger/PPCDebugInterface.h" -#include "Debugger/Debugger_SymbolMap.h" - -#include "Core.h" -#include "StringUtil.h" -#include "LogManager.h" -#include "../WxUtils.h" - -#include "../Globals.h" +#include "Common/LogManager.h" +#include "Common/StringUtil.h" +#include "Core/Core.h" +#include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HW/CPU.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/JitWindow.h" enum { diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h index e91f7d7893..6eb0869284 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.h +++ b/Source/Core/DolphinWX/Debugger/JitWindow.h @@ -7,13 +7,13 @@ #include #include -#include -#include #include +#include +#include -#include "MemoryView.h" -#include "Thread.h" -#include "CoreParameter.h" +#include "Common/Thread.h" +#include "Core/CoreParameter.h" +#include "DolphinWX/Debugger/MemoryView.h" class JitBlockList : public wxListCtrl { diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp index 821ca30af2..f8ed8ba5d2 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../WxUtils.h" -#include "MemoryCheckDlg.h" -#include "Common.h" -#include "StringUtil.h" -#include "PowerPC/PowerPC.h" -#include "BreakpointWindow.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" +#include "DolphinWX/Debugger/MemoryCheckDlg.h" #define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text), wxDefaultPosition, wxDefaultSize) diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 56a5c4c493..832c13ca9f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -2,17 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DebuggerUIUtil.h" -#include "Common.h" -#include "Host.h" -#include "PowerPC/PowerPC.h" -#include "HW/Memmap.h" - -#include "MemoryView.h" -#include "../WxUtils.h" - -#include #include +#include + +#include "Common/Common.h" +#include "Core/Host.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" +#include "DolphinWX/Debugger/MemoryView.h" enum { diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h index b6fcc2fae6..b018669295 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.h +++ b/Source/Core/DolphinWX/Debugger/MemoryView.h @@ -4,9 +4,9 @@ #pragma once -#include "DebuggerUIUtil.h" -#include "Common.h" -#include "DebugInterface.h" +#include "Common/Common.h" +#include "Common/DebugInterface.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" class CMemoryView : public wxControl { diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index 6c351b77a5..516ab41788 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -3,28 +3,23 @@ // Refer to the license.txt file included. #include +#include #include -#include #include -#include -#include "../WxUtils.h" -#include "MemoryWindow.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "FileUtil.h" - -#include "Debugger/PPCDebugInterface.h" -#include "PowerPC/PPCSymbolDB.h" - -#include "Core.h" -#include "ConfigManager.h" -#include "LogManager.h" - -#include "HW/Memmap.h" -#include "HW/DSP.h" - -#include "../../DolphinWX/Globals.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DSP.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/MemoryWindow.h" enum { diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index 9cd74399c8..19fbe1cb29 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -5,13 +5,13 @@ #pragma once #include -#include #include -#include "MemoryView.h" -#include "Thread.h" -#include "StringUtil.h" +#include -#include "CoreParameter.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" +#include "Core/CoreParameter.h" +#include "DolphinWX/Debugger/MemoryView.h" class CRegisterWindow; class CBreakPointWindow; diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 310b6077c5..b2045c82f1 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DebuggerUIUtil.h" -#include "RegisterView.h" -#include "PowerPC/PowerPC.h" -#include "HW/ProcessorInterface.h" -#include "IniFile.h" -#include "../WxUtils.h" +#include "Common/IniFile.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" +#include "DolphinWX/Debugger/RegisterView.h" // F-zero 80005e60 wtf?? diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h index 9cb046bd4e..6bcd46a36f 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.h +++ b/Source/Core/DolphinWX/Debugger/RegisterView.h @@ -6,7 +6,7 @@ #include -#include "Common.h" +#include "Common/Common.h" // New register view: // R0 0x8000000 F0 0.0000 F0_PS1 0.0000 diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp index c8cb9d1433..c18d207f8d 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp @@ -4,9 +4,9 @@ #include -#include "RegisterWindow.h" -#include "PowerPC/PowerPC.h" -#include "RegisterView.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/Debugger/RegisterView.h" +#include "DolphinWX/Debugger/RegisterWindow.h" extern const char* GetGRPName(unsigned int index); diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index cf8d7baad6..5a8a39bbe3 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -2,20 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FifoPlayerDlg.h" -#include "FileUtil.h" -#include "Thread.h" -#include "FifoPlayer/FifoPlayer.h" -#include "FifoPlayer/FifoRecorder.h" -#include "OpcodeDecoding.h" -#include "WxUtils.h" - -#include -#include - #include #include +#include +#include + +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/Thread.h" +#include "Core/FifoPlayer/FifoPlayer.h" +#include "Core/FifoPlayer/FifoRecorder.h" +#include "DolphinWX/FifoPlayerDlg.h" +#include "DolphinWX/WxUtils.h" +#include "VideoCommon/OpcodeDecoding.h" DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h index 84675432f2..4e72878fc7 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/FifoPlayerDlg.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include class wxSpinCtrl; class wxSpinEvent; diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index c86d035a1f..2a17f6c21c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,40 +10,42 @@ // m_Panel. The new child window handle that is returned by CreateWindow() can // be accessed from Core::GetWindowHandle(). -#include "Common.h" // Common -#include "FileUtil.h" -#include "Timer.h" +#ifdef __APPLE__ +#include +#endif +#include -#include "Globals.h" // Local -#include "Frame.h" -#include "ConfigMain.h" -#include "CheatsWindow.h" -#include "GameListCtrl.h" -#include "BootManager.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/Timer.h" -#include "ConfigManager.h" // Core -#include "Core.h" -#include "HW/DVDInterface.h" -#include "HW/GCPad.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "State.h" -#include "VolumeHandler.h" -#include "Movie.h" -#include "RenderBase.h" -#include "VideoConfig.h" -#include "VertexShaderManager.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" +#include "Core/State.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/GCPad.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "VideoBackendBase.h" +#include "DolphinWX/CheatsWindow.h" +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" -#include // wxWidgets +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoBackendBase.h" +#include "VideoCommon/VideoConfig.h" // Resources extern "C" { -#include "resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon }; - #ifdef _WIN32 // I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */ HWND MSWGetParent_(HWND Parent) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index b00a82d8d2..6894f9d733 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -4,28 +4,26 @@ #pragma once -#include // wxWidgets -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include -#ifdef __APPLE__ -#include -#endif +#include "Common/CDUtils.h" +#include "Core/Movie.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/TASInputDlg.h" +#include "DolphinWX/Debugger/CodeWindow.h" -#include "CDUtils.h" -#include "Debugger/CodeWindow.h" -#include "LogWindow.h" -#include "LogConfigWindow.h" -#include "TASInputDlg.h" -#include "Movie.h" #if defined(HAVE_X11) && HAVE_X11 -#include "X11Utils.h" +#include "DolphinWX/X11Utils.h" #endif // A shortcut to access the bitmaps diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 1cc9445a0e..ccba858a33 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -2,14 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" // Common - -#include "Globals.h" // Local -#include "Frame.h" -#include "LogWindow.h" -#include "WxUtils.h" - -#include "ConfigManager.h" // Core +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/WxUtils.h" // ------------ // Aui events diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 87e51db736..27da521253 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -14,52 +14,54 @@ window handle that is returned by CreateWindow() can be accessed from Core::GetWindowHandle(). */ -#include "NetWindow.h" -#include "Common.h" // Common -#include "FileUtil.h" -#include "FileSearch.h" -#include "Timer.h" -#include "VideoBackendBase.h" +#include #ifdef __APPLE__ #include #endif -#include "Globals.h" // Local -#include "Frame.h" -#include "ConfigMain.h" -#include "MemcardManager.h" -#include "CheatsWindow.h" -#include "AboutDolphin.h" -#include "GameListCtrl.h" -#include "BootManager.h" -#include "LogWindow.h" -#include "LogConfigWindow.h" -#include "FifoPlayerDlg.h" -#include "WxUtils.h" -#include "Host.h" +#include "Common/Common.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/Timer.h" -#include "ConfigManager.h" // Core -#include "Core.h" -#include "Movie.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "HW/DVDInterface.h" -#include "HW/ProcessorInterface.h" -#include "HW/GCPad.h" -#include "HW/Wiimote.h" -#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/State.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/Wiimote.h" //#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h" -#include "State.h" -#include "VolumeHandler.h" -#include "NANDContentLoader.h" -#include "WXInputBase.h" -#include "WiimoteConfigDiag.h" -#include "InputConfigDiag.h" -#include "HotkeyDlg.h" -#include "TASInputDlg.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" -#include // wxWidgets +#include "DiscIO/NANDContentLoader.h" + +#include "DolphinWX/AboutDolphin.h" +#include "DolphinWX/CheatsWindow.h" +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/FifoPlayerDlg.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/HotkeyDlg.h" +#include "DolphinWX/InputConfigDiag.h" +#include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/MemcardManager.h" +#include "DolphinWX/NetWindow.h" +#include "DolphinWX/TASInputDlg.h" +#include "DolphinWX/WiimoteConfigDiag.h" +#include "DolphinWX/WXInputBase.h" +#include "DolphinWX/WxUtils.h" + +#include "VideoCommon/VideoBackendBase.h" #ifdef _WIN32 #ifndef SM_XVIRTUALSCREEN @@ -78,7 +80,7 @@ Core::GetWindowHandle(). // Resources extern "C" { -#include "resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon }; bool confirmStop = false; diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index bd0fcc562b..09724de80c 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -2,16 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoConfig.h" -#include "Host.h" -#include "RenderBase.h" -#include "ConfigManager.h" - #include -#include "VertexShaderManager.h" -#include "GLInterface.h" -#include "AGL.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" + +#include "DolphinWX/GLInterface/GLInterface.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" void cInterfaceAGL::Swap() { diff --git a/Source/Core/DolphinWX/GLInterface/AGL.h b/Source/Core/DolphinWX/GLInterface/AGL.h index 1554f71b36..8f75df51cd 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.h +++ b/Source/Core/DolphinWX/GLInterface/AGL.h @@ -8,7 +8,7 @@ #import #endif -#include "InterfaceBase.h" +#include "DolphinWX/GLInterface/InterfaceBase.h" class cInterfaceAGL : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index d8342ce599..6a25aa4411 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -1,25 +1,10 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Host.h" -#include "RenderBase.h" - -#include "GLInterface.h" -#include "EGL.h" +#include "Core/Host.h" +#include "DolphinWX/GLInterface/GLInterface.h" +#include "VideoCommon/RenderBase.h" // Show the current FPS void cInterfaceEGL::UpdateFPSDisplay(const char *text) diff --git a/Source/Core/DolphinWX/GLInterface/EGL.h b/Source/Core/DolphinWX/GLInterface/EGL.h index f3e8e5bb88..54a977aa1b 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/GLInterface/EGL.h @@ -5,8 +5,9 @@ #pragma once #include -#include "InterfaceBase.h" -#include "ConfigManager.h" + +#include "Core/ConfigManager.h" +#include "DolphinWX/GLInterface/InterfaceBase.h" class cPlatform diff --git a/Source/Core/DolphinWX/GLInterface/GLInterface.h b/Source/Core/DolphinWX/GLInterface/GLInterface.h index 96cf56134d..edd7d93665 100644 --- a/Source/Core/DolphinWX/GLInterface/GLInterface.h +++ b/Source/Core/DolphinWX/GLInterface/GLInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "Thread.h" +#include "Common/Thread.h" #if USE_EGL // Currently Wayland/EGL and X11/EGL platforms are supported. @@ -19,19 +19,19 @@ enum egl_platform { }; #if HAVE_X11 -#include "GLInterface/X11_Util.h" +#include "DolphinWX/GLInterface/X11_Util.h" #endif #if HAVE_WAYLAND -#include "GLInterface/Wayland_Util.h" +#include "DolphinWX/GLInterface/Wayland_Util.h" #endif -#include "GLInterface/EGL.h" +#include "DolphinWX/GLInterface/EGL.h" #elif defined(__APPLE__) -#include "GLInterface/AGL.h" +#include "DolphinWX/GLInterface/AGL.h" #elif defined(_WIN32) -#include "GLInterface/WGL.h" +#include "DolphinWX/GLInterface/WGL.h" #elif HAVE_X11 -#include "GLInterface/GLX.h" +#include "DolphinWX/GLInterface/GLX.h" #include #else #error Platform doesnt have a GLInterface diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index bd4da61b4b..ea220d8876 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Host.h" -#include "RenderBase.h" -#include "VideoConfig.h" +#include "Core/Host.h" -#include "GLInterface.h" -#include "GLX.h" +#include "DolphinWX/GLInterface/GLInterface.h" + +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoConfig.h" typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval); PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL; diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h index 92cabf3829..3b6639553c 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/GLInterface/GLX.h @@ -4,8 +4,8 @@ #pragma once -#include "X11_Util.h" -#include "InterfaceBase.h" +#include "DolphinWX/GLInterface/InterfaceBase.h" +#include "DolphinWX/GLInterface/X11_Util.h" class cInterfaceGLX : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h index c13bfe8421..e01539ab5d 100644 --- a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h @@ -4,6 +4,8 @@ #pragma once +#include "Common/Common.h" + enum GLInterfaceMode { MODE_DETECT = 0, MODE_OPENGL, diff --git a/Source/Core/DolphinWX/GLInterface/Platform.cpp b/Source/Core/DolphinWX/GLInterface/Platform.cpp index 98d0db9441..816731a249 100644 --- a/Source/Core/DolphinWX/GLInterface/Platform.cpp +++ b/Source/Core/DolphinWX/GLInterface/Platform.cpp @@ -1,22 +1,9 @@ -// Copyright (C) 2013 Scott Moreau +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Host.h" -#include "GLInterface/GLInterface.h" +#include "Core/Host.h" +#include "DolphinWX/GLInterface/GLInterface.h" bool cPlatform::SelectDisplay(void) { diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp index d98410f561..5de1468113 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoConfig.h" -#include "Host.h" -#include "RenderBase.h" +#include "Core/Host.h" -#include "VertexShaderManager.h" -#include "GLInterface.h" -#include "WGL.h" +#include "DolphinWX/GLInterface/GLInterface.h" + +#include "VideoCommon/EmuWindow.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" -#include "EmuWindow.h" static HDC hDC = NULL; // Private GDI Device Context static HGLRC hRC = NULL; // Permanent Rendering Context static HINSTANCE dllHandle = NULL; // Handle to OpenGL32.dll diff --git a/Source/Core/DolphinWX/GLInterface/WGL.h b/Source/Core/DolphinWX/GLInterface/WGL.h index 22f7b3e9cd..fa8846cfbe 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.h +++ b/Source/Core/DolphinWX/GLInterface/WGL.h @@ -4,7 +4,7 @@ #pragma once -#include "InterfaceBase.h" +#include "DolphinWX/GLInterface/InterfaceBase.h" class cInterfaceWGL : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp index f2e0fb1a40..19dbb7ab02 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Core.h" -#include "State.h" -#include "GLInterface.h" #include #include +#include "Core/Core.h" +#include "Core/State.h" +#include "DolphinWX/GLInterface/GLInterface.h" + static void hide_cursor(void) { diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h index af18fb0e70..9025e00505 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include #include #define MOD_SHIFT_MASK 0x01 diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp index a20c88fdfe..d3f4c5b9f2 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp @@ -1,23 +1,10 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Host.h" -#include "VideoConfig.h" -#include "GLInterface.h" +#include "Core/Host.h" +#include "DolphinWX/GLInterface/GLInterface.h" +#include "VideoCommon/VideoConfig.h" #if USE_EGL bool cXInterface::ServerConnect(void) diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.h b/Source/Core/DolphinWX/GLInterface/X11_Util.h index 94ebce38f1..6294df5f9e 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.h +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include #if USE_EGL diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index f89cdc9514..800cee9694 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -2,45 +2,41 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" - -#include -#include -#include - #include #include #include +#include +#include +#include -#include "FileSearch.h" -#include "StringUtil.h" -#include "ConfigManager.h" -#include "GameListCtrl.h" -#include "Blob.h" -#include "Core.h" -#include "ISOProperties.h" -#include "FileUtil.h" -#include "CDUtils.h" -#include "WxUtils.h" -#include "Main.h" -#include "MathUtil.h" -#include "HW/DVDInterface.h" - -#include "resources/Flag_Europe.xpm" -#include "resources/Flag_Germany.xpm" -#include "resources/Flag_France.xpm" -#include "resources/Flag_Italy.xpm" -#include "resources/Flag_Japan.xpm" -#include "resources/Flag_USA.xpm" -#include "resources/Flag_Taiwan.xpm" -#include "resources/Flag_Korea.xpm" -#include "resources/Flag_Unknown.xpm" -#include "resources/Flag_SDK.xpm" - -#include "resources/Platform_Wad.xpm" -#include "resources/Platform_Wii.xpm" -#include "resources/Platform_Gamecube.xpm" -#include "resources/rating_gamelist.h" +#include "Common/CDUtils.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/MathUtil.h" +#include "Common/StringUtil.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/DVDInterface.h" +#include "DiscIO/Blob.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/ISOProperties.h" +#include "DolphinWX/Main.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/resources/Flag_Europe.xpm" +#include "DolphinWX/resources/Flag_France.xpm" +#include "DolphinWX/resources/Flag_Germany.xpm" +#include "DolphinWX/resources/Flag_Italy.xpm" +#include "DolphinWX/resources/Flag_Japan.xpm" +#include "DolphinWX/resources/Flag_Korea.xpm" +#include "DolphinWX/resources/Flag_SDK.xpm" +#include "DolphinWX/resources/Flag_Taiwan.xpm" +#include "DolphinWX/resources/Flag_Unknown.xpm" +#include "DolphinWX/resources/Flag_USA.xpm" +#include "DolphinWX/resources/Platform_Gamecube.xpm" +#include "DolphinWX/resources/Platform_Wad.xpm" +#include "DolphinWX/resources/Platform_Wii.xpm" +#include "DolphinWX/resources/rating_gamelist.h" size_t CGameListCtrl::m_currentItem = 0; size_t CGameListCtrl::m_numberItem = 0; diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 342df3f64b..7b3009d7d3 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -10,8 +10,8 @@ #include #include -#include "ISOFile.h" -#include "MemoryCards/WiiSaveCrypted.h" +#include "DolphinWX/ISOFile.h" +#include "DolphinWX/MemoryCards/WiiSaveCrypted.h" class wxEmuStateTip : public wxTipWindow { diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/GeckoCodeDiag.cpp index bf10bb20c1..7e48bf53d0 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/GeckoCodeDiag.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GeckoCodeDiag.h" -#include "Core.h" -#include "WxUtils.h" +#include #include -#include +#include "Core/Core.h" +#include "DolphinWX/GeckoCodeDiag.h" +#include "DolphinWX/WxUtils.h" namespace Gecko { diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.h b/Source/Core/DolphinWX/GeckoCodeDiag.h index 6ed7d7aefc..bf3fb06c62 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/GeckoCodeDiag.h @@ -4,10 +4,10 @@ #pragma once -#include "GeckoCode.h" -#include "GeckoCodeConfig.h" +#include -#include "wx/wx.h" +#include "Core/GeckoCode.h" +#include "Core/GeckoCodeConfig.h" namespace Gecko { diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index e7ab405cb5..f114b8f8f4 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -7,7 +7,24 @@ #pragma once -#include "Common.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Common/Common.h" enum { @@ -251,23 +268,6 @@ enum LIST_CTRL = 1000 }; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - // custom message macro #define EVT_HOST_COMMAND(id, fn) \ DECLARE_EVENT_TABLE_ENTRY(\ diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index 5fe375c04f..12b4bd8ec8 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -4,8 +4,8 @@ #include -#include "HotkeyDlg.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "DolphinWX/HotkeyDlg.h" BEGIN_EVENT_TABLE(HotkeyConfigDialog,wxDialog) EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1, diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h index 4c389ea534..8ca4fc9af8 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -4,20 +4,20 @@ #pragma once -#include -#include #include -#include -#include #include +#include #include +#include +#include +#include -#include "Common.h" -#include "CoreParameter.h" -#include "WXInputBase.h" +#include "Common/Common.h" +#include "Core/CoreParameter.h" +#include "DolphinWX/WXInputBase.h" #if defined(HAVE_X11) && HAVE_X11 -#include "X11InputBase.h" +#include "InputCommon/X11InputBase.h" #include #include #endif diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index cb3e01eda4..fabdd9ec55 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -2,28 +2,29 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include #include -#include -#include "Common.h" -#include "CommonPaths.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/Hash.h" +#include "Common/IniFile.h" +#include "Common/StringUtil.h" -#include "Globals.h" -#include "FileUtil.h" -#include "ISOFile.h" -#include "StringUtil.h" -#include "Hash.h" -#include "IniFile.h" -#include "WxUtils.h" +#include "Core/ConfigManager.h" -#include "Filesystem.h" -#include "BannerLoader.h" -#include "FileSearch.h" -#include "CompressedBlob.h" -#include "ChunkFile.h" -#include "ConfigManager.h" +#include "DiscIO/BannerLoader.h" +#include "DiscIO/CompressedBlob.h" +#include "DiscIO/Filesystem.h" + +#include "DolphinWX/Globals.h" +#include "DolphinWX/ISOFile.h" +#include "DolphinWX/WxUtils.h" static const u32 CACHE_REVISION = 0x115; diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index 724413f340..dc6d2119c6 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -4,11 +4,11 @@ #pragma once -#include #include +#include -#include "Volume.h" -#include "VolumeCreator.h" +#include "DiscIO/Volume.h" +#include "DiscIO/VolumeCreator.h" #if defined(HAVE_WX) && HAVE_WX #include diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 1b873de492..e632340a6a 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -6,27 +6,25 @@ #import #endif -#include #include +#include -#include "Common.h" -#include "CommonPaths.h" -#include "Globals.h" - -#include "WxUtils.h" -#include "VolumeCreator.h" -#include "Filesystem.h" -#include "ISOProperties.h" -#include "PHackSettings.h" -#include "PatchAddEdit.h" -#include "ARCodeAddEdit.h" -#include "GeckoCodeDiag.h" -#include "ConfigManager.h" -#include "StringUtil.h" - -#include "resources/isoprop_file.xpm" -#include "resources/isoprop_folder.xpm" -#include "resources/isoprop_disc.xpm" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/StringUtil.h" +#include "Core/ConfigManager.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" +#include "DolphinWX/ARCodeAddEdit.h" +#include "DolphinWX/GeckoCodeDiag.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/ISOProperties.h" +#include "DolphinWX/PatchAddEdit.h" +#include "DolphinWX/PHackSettings.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/resources/isoprop_disc.xpm" +#include "DolphinWX/resources/isoprop_file.xpm" +#include "DolphinWX/resources/isoprop_folder.xpm" struct WiiPartition { diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 82c8bd48a2..12c709f3be 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -4,24 +4,24 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "ISOFile.h" -#include "Filesystem.h" -#include "IniFile.h" -#include "PatchEngine.h" -#include "ActionReplay.h" -#include "GeckoCodeDiag.h" +#include "Common/IniFile.h" +#include "Core/ActionReplay.h" +#include "Core/PatchEngine.h" +#include "DiscIO/Filesystem.h" +#include "DolphinWX/GeckoCodeDiag.h" +#include "DolphinWX/ISOFile.h" struct PHackData { diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 350edcddd3..d707eacf93 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "InputConfigDiag.h" -#include "UDPConfigDiag.h" -#include "WxUtils.h" -#include "HW/Wiimote.h" -#include "ControllerInterface/ExpressionParser.h" +#include "Core/HW/Wiimote.h" +#include "DolphinWX/InputConfigDiag.h" +#include "DolphinWX/UDPConfigDiag.h" +#include "DolphinWX/WxUtils.h" +#include "InputCommon/ControllerInterface/ExpressionParser.h" using namespace ciface::ExpressionParser; diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index 7c5e10e3a5..d265e87713 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -11,25 +11,24 @@ // might have to change this setup for wiimote #define PROFILES_PATH "Profiles/" -#include -#include -#include +#include +#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include -#include -#include - -#include "ControllerInterface/ControllerInterface.h" -#include "ControllerEmu.h" -#include "InputConfig.h" -#include "FileSearch.h" -#include "UDPWrapper.h" +#include "Common/FileSearch.h" +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/InputConfig.h" +#include "InputCommon/UDPWrapper.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" class PadSetting { diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp index fd132475ef..2e722ff53c 100644 --- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "InputConfigDiag.h" -#include "WxUtils.h" +#include "DolphinWX/InputConfigDiag.h" +#include "DolphinWX/WxUtils.h" void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) { diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp index 2d616909da..1ec51c7050 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/LogConfigWindow.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "LogConfigWindow.h" -#include "LogManager.h" -#include "LogWindow.h" -#include "FileUtil.h" -#include "WxUtils.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/WxUtils.h" LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id) : wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration")) diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 92702e2b3f..8376149f28 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "LogWindow.h" -#include "IniFile.h" -#include "FileUtil.h" -#include "Debugger/DebuggerUIUtil.h" -#include "WxUtils.h" - #include +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" + // Milliseconds between msgQueue flushes to wxTextCtrl #define UPDATETIME 200 diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 4fc5bc8e37..bb1b59cc12 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -4,11 +4,12 @@ #pragma once -#include "LogManager.h" -#include "Frame.h" -#include "Thread.h" #include +#include "Common/LogManager.h" +#include "Common/Thread.h" +#include "DolphinWX/Frame.h" + enum { IDM_LOG, diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 6b416a42e5..97cded8c3b 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -2,37 +2,36 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include +#include +#include -#include "Common.h" -#include "CommonPaths.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/CPUDetect.h" +#include "Common/ExtendedTrace.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" + +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/HW/Wiimote.h" + +#include "DolphinWX/Frame.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/Main.h" +#include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/JitWindow.h" + +#include "VideoCommon/VideoBackendBase.h" #if defined HAVE_X11 && HAVE_X11 #include #endif -#include "CPUDetect.h" -#include "IniFile.h" -#include "FileUtil.h" - -#include "Host.h" // Core -#include "HW/Wiimote.h" - -#include "WxUtils.h" -#include "Globals.h" // Local -#include "Main.h" -#include "ConfigManager.h" -#include "Debugger/CodeWindow.h" -#include "Debugger/JitWindow.h" -#include "ExtendedTrace.h" -#include "BootManager.h" -#include "Frame.h" - -#include "VideoBackendBase.h" - -#include - #ifdef _WIN32 #include @@ -75,7 +74,6 @@ BEGIN_EVENT_TABLE(DolphinApp, wxApp) EVT_END_SESSION(DolphinApp::OnEndSession) END_EVENT_TABLE() -#include bool wxMsgAlert(const char*, const char*, bool, int); std::string wxStringTranslator(const char *); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index cb932c1424..3901e017ad 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -4,7 +4,7 @@ #pragma once -#include "Frame.h" +#include "DolphinWX/Frame.h" // Define a new application class CFrame; diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index d235a8a283..7f49b1dc28 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -14,38 +14,36 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include -#include -#include - -#include "Common.h" -#include "FileUtil.h" - -#include "Core.h" -#include "Host.h" -#include "CPUDetect.h" -#include "Thread.h" - -#include "State.h" -#include "PowerPC/PowerPC.h" -#include "HW/Wiimote.h" - -#include "VideoBackendBase.h" -#include "ConfigManager.h" -#include "LogManager.h" -#include "BootManager.h" -#include "OnScreenDisplay.h" - -// Banner loading -#include "Filesystem.h" -#include "BannerLoader.h" -#include "VolumeCreator.h" - -#include "Android/ButtonManager.h" +#include +#include +#include #include #include #include + +#include "Android/ButtonManager.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/State.h" +#include "Core/HW/Wiimote.h" +#include "Core/PowerPC/PowerPC.h" + +// Banner loading +#include "DiscIO/BannerLoader.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" + +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/VideoBackendBase.h" + ANativeWindow* surf; int g_width, g_height; std::string g_filename; diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index cfd5b22c9f..ac7941d87e 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -2,41 +2,41 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include -#include +#include +#include +#include #include -#include "Common.h" -#include "FileUtil.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" + +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/HW/Wiimote.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" #if HAVE_X11 #include -#include "State.h" -#include "X11Utils.h" +#include "Core/State.h" +#include "DolphinWX/X11Utils.h" #endif #if HAVE_WAYLAND #include -#include "GLInterface/GLInterface.h" +#include "DolphinWX/GLInterface/GLInterface.h" #endif #ifdef __APPLE__ #import #endif -#include "Core.h" -#include "Host.h" -#include "CPUDetect.h" -#include "Thread.h" -#include "PowerPC/PowerPC.h" -#include "HW/Wiimote.h" - -#include "VideoBackendBase.h" -#include "ConfigManager.h" -#include "LogManager.h" -#include "BootManager.h" - bool rendererHasFocus = true; bool running = true; diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index cd9df68cbb..e7d2466e01 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/Source/Core/DolphinWX/MemcardManager.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MemcardManager.h" -#include "Common.h" +#include -#include "WxUtils.h" -#include "wx/mstream.h" +#include "Common/Common.h" +#include "DolphinWX/MemcardManager.h" +#include "DolphinWX/WxUtils.h" #define ARROWS slot ? _T("") : ARROW[slot], slot ? ARROW[slot] : _T("") diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 371ffa07fe..775146f4a2 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -4,18 +4,18 @@ #pragma once -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include -#include +#include -#include "IniFile.h" -#include "FileUtil.h" -#include "HW/GCMemcard.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Core/HW/GCMemcard.h" #undef MEMCARD_MANAGER_STYLE #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX diff --git a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp index d89a702102..1703b79ba0 100644 --- a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp +++ b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp @@ -10,11 +10,10 @@ #include #include -#include "WiiSaveCrypted.h" -#include "FileUtil.h" -#include "MathUtil.h" -#include "NandPaths.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Common/MathUtil.h" +#include "Common/NandPaths.h" +#include "DolphinWX/MemoryCards/WiiSaveCrypted.h" static Common::replace_v replacements; diff --git a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h index ba1affec0b..c2c85cb333 100644 --- a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h +++ b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h @@ -4,10 +4,11 @@ #pragma once -#include "StringUtil.h" -#include "Crypto/tools.h" #include -#include "polarssl/md5.h" +#include + +#include "Common/StringUtil.h" +#include "Common/Crypto/tools.h" // --- this is used for encrypted Wii save files diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 2f81de3341..a5eadd1e97 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -2,20 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include - -#include "WxUtils.h" -#include "NetPlayClient.h" -#include "NetPlayServer.h" -#include "NetWindow.h" -#include "Frame.h" -#include "Core.h" -#include "ConfigManager.h" - #include #include +#include "Common/FileUtil.h" +#include "Common/IniFile.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/NetPlayClient.h" +#include "Core/NetPlayServer.h" + +#include "DolphinWX/Frame.h" +#include "DolphinWX/NetWindow.h" +#include "DolphinWX/WxUtils.h" + #define NETPLAY_TITLEBAR "Dolphin NetPlay" #define INITIAL_PAD_BUFFER_SIZE 20 diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index bd59585512..b02f735f6c 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -4,25 +4,21 @@ #pragma once -#include "CommonTypes.h" - #include #include - -#include -#include -#include #include -#include +#include #include #include +#include +#include #include +#include -#include "GameListCtrl.h" - -#include "FifoQueue.h" - -#include "NetPlayClient.h" +#include "Common/CommonTypes.h" +#include "Common/FifoQueue.h" +#include "Core/NetPlayClient.h" +#include "DolphinWX/GameListCtrl.h" enum { diff --git a/Source/Core/DolphinWX/PHackSettings.cpp b/Source/Core/DolphinWX/PHackSettings.cpp index 3db44891e6..086303ebdf 100644 --- a/Source/Core/DolphinWX/PHackSettings.cpp +++ b/Source/Core/DolphinWX/PHackSettings.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonPaths.h" -#include "PHackSettings.h" -#include "ConfigManager.h" -#include "WxUtils.h" +#include "Common/CommonPaths.h" +#include "Core/ConfigManager.h" +#include "DolphinWX/PHackSettings.h" +#include "DolphinWX/WxUtils.h" extern PHackData PHack_Data; diff --git a/Source/Core/DolphinWX/PHackSettings.h b/Source/Core/DolphinWX/PHackSettings.h index efa7d00b1d..18965b7b5f 100644 --- a/Source/Core/DolphinWX/PHackSettings.h +++ b/Source/Core/DolphinWX/PHackSettings.h @@ -4,9 +4,10 @@ #pragma once -#include #include -#include "ISOProperties.h" +#include + +#include "DolphinWX/ISOProperties.h" class CPHackSettings : public wxDialog { diff --git a/Source/Core/DolphinWX/PatchAddEdit.cpp b/Source/Core/DolphinWX/PatchAddEdit.cpp index 9850d2bc32..09a77a52be 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.cpp +++ b/Source/Core/DolphinWX/PatchAddEdit.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "PatchAddEdit.h" -#include "WxUtils.h" +#include "DolphinWX/PatchAddEdit.h" +#include "DolphinWX/WxUtils.h" extern std::vector onFrame; diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h index a5bc1f3791..e57c80a109 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.h +++ b/Source/Core/DolphinWX/PatchAddEdit.h @@ -4,9 +4,10 @@ #pragma once -#include #include -#include "ISOProperties.h" +#include + +#include "DolphinWX/ISOProperties.h" class CPatchAddEdit : public wxDialog { diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 8952725463..0ccb8bc890 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "TASInputDlg.h" -#include "Movie.h" +#include "Core/Movie.h" +#include "DolphinWX/TASInputDlg.h" BEGIN_EVENT_TABLE(TASInputDlg, wxDialog) diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index 391db0858e..45d54efdd5 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -6,9 +6,9 @@ #include -#include "Common.h" -#include "CoreParameter.h" -#include "../InputCommon/GCPadStatus.h" +#include "Common/Common.h" +#include "Core/CoreParameter.h" +#include "InputCommon/GCPadStatus.h" class TASInputDlg : public wxDialog { diff --git a/Source/Core/DolphinWX/UDPConfigDiag.cpp b/Source/Core/DolphinWX/UDPConfigDiag.cpp index 3504ae5c85..c01d913569 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.cpp +++ b/Source/Core/DolphinWX/UDPConfigDiag.cpp @@ -1,13 +1,12 @@ -#include "UDPConfigDiag.h" -#include "UDPWrapper.h" - -#include "Common.h" -#include "ControllerEmu.h" -#include "IniFile.h" -#include "WxUtils.h" - #include +#include "Common/Common.h" +#include "Common/IniFile.h" +#include "DolphinWX/UDPConfigDiag.h" +#include "DolphinWX/WxUtils.h" +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/UDPWrapper.h" + UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), wrp(_wrp) diff --git a/Source/Core/DolphinWX/UDPConfigDiag.h b/Source/Core/DolphinWX/UDPConfigDiag.h index 3c495c0686..97d5f04d3a 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.h +++ b/Source/Core/DolphinWX/UDPConfigDiag.h @@ -1,17 +1,17 @@ #pragma once -#include "UDPWrapper.h" - -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include + +#include "InputCommon/UDPWrapper.h" class UDPConfigDiag : public wxDialog { diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index afe3b45161..dfd958ce5c 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -1,12 +1,12 @@ -#include "VideoConfigDiag.h" - -#include "FileUtil.h" -#include "TextureCacheBase.h" -#include "Core.h" -#include "Frame.h" - #include +#include "Common/FileUtil.h" +#include "Core/Core.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/VideoConfigDiag.h" +#include "VideoCommon/TextureCacheBase.h" + + #ifdef __APPLE__ #include #endif diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index f2cc9d3071..fca4e1371d 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -1,25 +1,23 @@ #pragma once -#include -#include #include - -#include "ConfigManager.h" -#include "VideoConfig.h" -#include "Core.h" - -#include -#include +#include +#include #include -#include -#include #include +#include #include #include #include +#include +#include +#include -#include "MsgHandler.h" -#include "WxUtils.h" +#include "Common/MsgHandler.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "DolphinWX/WxUtils.h" +#include "VideoCommon/VideoConfig.h" template class BoolSetting : public W diff --git a/Source/Core/DolphinWX/WXInputBase.cpp b/Source/Core/DolphinWX/WXInputBase.cpp index 267f41e35b..22a1d5fcc4 100644 --- a/Source/Core/DolphinWX/WXInputBase.cpp +++ b/Source/Core/DolphinWX/WXInputBase.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "WXInputBase.h" +#include "DolphinWX/WXInputBase.h" namespace InputCommon { diff --git a/Source/Core/DolphinWX/WXInputBase.h b/Source/Core/DolphinWX/WXInputBase.h index 704bc02b7b..d47e2f3b75 100644 --- a/Source/Core/DolphinWX/WXInputBase.h +++ b/Source/Core/DolphinWX/WXInputBase.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" #if defined(HAVE_WX) && HAVE_WX #include #endif diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index 0dff321a3f..2de3bf05a9 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -1,9 +1,8 @@ - -#include "WiimoteConfigDiag.h" -#include "HW/Wiimote.h" -#include "HW/WiimoteReal/WiimoteReal.h" -#include "Frame.h" -#include "NetPlayProto.h" +#include "Core/NetPlayProto.h" +#include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/WiimoteConfigDiag.h" WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.h b/Source/Core/DolphinWX/WiimoteConfigDiag.h index 7d7acc9784..5ae4d88dfd 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -1,21 +1,20 @@ #pragma once -#include -#include -#include +#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include -#include "InputConfigDiag.h" -#include "ConfigManager.h" -#include - -#include +#include "Core/ConfigManager.h" +#include "Core/HW/Wiimote.h" +#include "DolphinWX/InputConfigDiag.h" class WiimoteConfigDiag : public wxDialog { diff --git a/Source/Core/DolphinWX/WxUtils.cpp b/Source/Core/DolphinWX/WxUtils.cpp index 617e32901e..a7ad6d4852 100644 --- a/Source/Core/DolphinWX/WxUtils.cpp +++ b/Source/Core/DolphinWX/WxUtils.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include #include +#include -#include "WxUtils.h" +#include "Common/Common.h" +#include "DolphinWX/WxUtils.h" #ifdef __APPLE__ #import diff --git a/Source/Core/DolphinWX/X11Utils.cpp b/Source/Core/DolphinWX/X11Utils.cpp index 71f0e43a2d..8b9971d96f 100644 --- a/Source/Core/DolphinWX/X11Utils.cpp +++ b/Source/Core/DolphinWX/X11Utils.cpp @@ -1,32 +1,20 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "X11Utils.h" - -#include #include +#include #include +#include "DolphinWX/X11Utils.h" + extern char **environ; #if defined(HAVE_WX) && HAVE_WX -#include #include -#include "WxUtils.h" +#include + +#include "DolphinWX/WxUtils.h" #endif namespace X11Utils diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index 27c0442d28..8139e26884 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -4,21 +4,29 @@ #pragma once -#include "Common.h" +// HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on +// common names such as "Status", "BadRequest" or "Response", causing SFML +// headers to be completely broken. +// +// We work around that issue by including SFML first before X11 headers. This +// is terrible, but such is the life with Xlib. +#include // NOLINT #if defined(HAVE_WX) && HAVE_WX -#include #include #include +#include #endif -#include #if defined(HAVE_XRANDR) && HAVE_XRANDR #include #endif +#include + +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" -#include "Core.h" -#include "ConfigManager.h" // EWMH state actions, see // http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec diff --git a/Source/Core/DolphinWX/stdafx.cpp b/Source/Core/DolphinWX/stdafx.cpp index b602b39925..accdd5e97c 100644 --- a/Source/Core/DolphinWX/stdafx.cpp +++ b/Source/Core/DolphinWX/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "DolphinWX/stdafx.h" diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 8224e8146c..34b8695ebd 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ControllerEmu.h" +#include "InputCommon/ControllerEmu.h" #if defined(HAVE_X11) && HAVE_X11 #include diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index e7ccabd8ca..9f8f2db497 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -7,16 +7,15 @@ // windows crap #define NOMINMAX +#include #include #include -#include #include -#include +#include -#include "GCPadStatus.h" - -#include "ControllerInterface/ControllerInterface.h" -#include "IniFile.h" +#include "Common/IniFile.h" +#include "InputCommon/GCPadStatus.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #define sign(x) ((x)?(x)<0?-1:1:0) diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 6ad7b13ad7..fa97e8f222 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Android.h" +#include "InputCommon/ControllerInterface/Android/Android.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 992bec80b1..aea09ac97c 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -4,8 +4,8 @@ #pragma once -#include "../Device.h" -#include "Android/ButtonManager.h" +#include "DolphinWX/Android/ButtonManager.h" +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index f1e2136ba9..7153a8d7f7 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -2,36 +2,35 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ControllerInterface.h" +#include "Common/Thread.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #if USE_EGL -#include "GLInterface/GLInterface.h" +#include "DolphinWX/GLInterface/GLInterface.h" #endif #ifdef CIFACE_USE_XINPUT - #include "XInput/XInput.h" + #include "InputCommon/ControllerInterface/XInput/XInput.h" #endif #ifdef CIFACE_USE_DINPUT - #include "DInput/DInput.h" + #include "InputCommon/ControllerInterface/DInput/DInput.h" #endif #ifdef CIFACE_USE_XLIB - #include "Xlib/Xlib.h" + #include "InputCommon/ControllerInterface/Xlib/Xlib.h" #ifdef CIFACE_USE_X11_XINPUT2 - #include "Xlib/XInput2.h" + #include "InputCommon/ControllerInterface/Xlib/XInput2.h" #endif #endif #ifdef CIFACE_USE_OSX - #include "OSX/OSX.h" + #include "InputCommon/ControllerInterface/OSX/OSX.h" #endif #ifdef CIFACE_USE_SDL - #include "SDL/SDL.h" + #include "InputCommon/ControllerInterface/SDL/SDL.h" #endif #ifdef CIFACE_USE_ANDROID - #include "Android/Android.h" + #include "InputCommon/ControllerInterface/Android/Android.h" #endif -#include "Thread.h" - using namespace ciface::ExpressionParser; namespace diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index b63ee9f793..affabafc9b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -4,16 +4,16 @@ #pragma once -#include -#include -#include -#include #include +#include +#include +#include +#include -#include "Common.h" -#include "Thread.h" -#include "ExpressionParser.h" -#include "Device.h" +#include "Common/Common.h" +#include "Common/Thread.h" +#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/ExpressionParser.h" // enable disable sources #ifdef _WIN32 diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index b9f483da4d..f2d2460ee6 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DInput.h" +#include "Common/StringUtil.h" -#include "StringUtil.h" +#include "InputCommon/ControllerInterface/DInput/DInput.h" -#include "DInputJoystick.h" -#include "DInputKeyboardMouse.h" +#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" +#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" #pragma comment(lib, "Dinput8.lib") #pragma comment(lib, "dxguid.lib") diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index 939f9d6da3..b4f1b27199 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -4,17 +4,16 @@ #pragma once -#include "../Device.h" - #define DINPUT_SOURCE_NAME "DInput" #define DIRECTINPUT_VERSION 0x0800 #define WIN32_LEAN_AND_MEAN #define NOMINMAX -#include #include - #include +#include + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 07e439e4eb..e98c13df88 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -2,15 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DInputJoystick.h" -#include "DInput.h" - +#include #include #include -#include - #include -#include + +#include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 045a8febc6..0ac535cdfe 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -4,8 +4,8 @@ #pragma once -#include "../Device.h" -#include "../ForceFeedback/ForceFeedbackDevice.h" +#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 4b17574d7b..c9dd9034fe 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -2,8 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DInputKeyboardMouse.h" -#include "DInput.h" +#include + +#include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" // (lower would be more sensitive) user can lower sensitivity by setting range // seems decent here ( at 8 ), I don't think anyone would need more sensitive than this @@ -25,7 +27,7 @@ static const struct const char* const name; } named_keys[] = { -#include "NamedKeys.h" +#include "InputCommon/ControllerInterface/DInput/NamedKeys.h" // NOLINT }; static const struct diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index aeeacca5e2..558917e9cc 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -4,13 +4,13 @@ #pragma once -#include "../Device.h" - #define DIRECTINPUT_VERSION 0x0800 #define WIN32_LEAN_AND_MEAN #define NOMINMAX -#include #include +#include + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 1b402e9b23..295fc10b5a 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Device.h" - -#include #include +#include + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index f61099f6fb..8b4dc65fbb 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -7,7 +7,7 @@ #include #include -#include "Common.h" +#include "Common/Common.h" // idk in case I wanted to change it to double or something, idk what's best typedef float ControlState; diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index 802d1b8f0f..4e2f49f4d0 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ExpressionParser.h" - +#include #include #include -#include #include +#include #include +#include "InputCommon/ControllerInterface/ExpressionParser.h" + using namespace ciface::Core; namespace ciface diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h index deab16829e..18f972ce9e 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h @@ -5,7 +5,7 @@ #pragma once #include -#include "Device.h" +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp index ff96aabb4b..7a4dfdaccc 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ForceFeedbackDevice.h" +#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h index 8eea274182..9ef5873702 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -4,7 +4,9 @@ #pragma once -#include "../Device.h" +#include + +#include "InputCommon/ControllerInterface/Device.h" #ifdef _WIN32 #define DIRECTINPUT_VERSION 0x0800 @@ -13,11 +15,9 @@ #include #include #elif __APPLE__ -#include "OSX/DirectInputAdapter.h" +#include "InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h" #endif -#include - namespace ciface { namespace ForceFeedback diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h index 4217ae0169..95e685c8ce 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h @@ -4,7 +4,7 @@ #pragma once -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index 93100a91f0..50b568cb9a 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -6,9 +6,9 @@ #include #include -#include "OSX.h" -#include "OSXKeyboard.h" -#include "OSXJoystick.h" +#include "InputCommon/ControllerInterface/OSX/OSX.h" +#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h" +#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h" #include diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h index 3ad20ad039..ffbe475840 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h @@ -6,8 +6,8 @@ #include -#include "../Device.h" -#include "../ForceFeedback/ForceFeedbackDevice.h" +#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm index dbf5beff3c..6e0623e716 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include #include -#include "OSXJoystick.h" - -#include +#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h index 170e4ae9f2..36705075ee 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h @@ -6,7 +6,7 @@ #include -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm index 101971dab6..fc784b81c6 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include #include #include #include // wxWidgets -#include "OSXKeyboard.h" - -#include +#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 074308305c..64c012c1c1 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SDL.h" -#include - +#include #include #include -#include + +#include "Common/StringUtil.h" +#include "InputCommon/ControllerInterface/SDL/SDL.h" #ifdef _WIN32 #pragma comment(lib, "SDL2.lib") diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index f9ed688932..15f39998b9 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -4,12 +4,13 @@ #pragma once -#include "../Device.h" - #include #include +#include "InputCommon/ControllerInterface/Device.h" + + #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index a5b382e1ff..7574641258 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -1,5 +1,5 @@ -#include "XInput.h" +#include "InputCommon/ControllerInterface/XInput/XInput.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 39704821d7..f3dc398904 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -5,12 +5,12 @@ #pragma once -#include "../Device.h" - #define NOMINMAX -#include +#include #include +#include "InputCommon/ControllerInterface/Device.h" + #ifndef XINPUT_DEVSUBTYPE_FLIGHT_STICK #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong. #endif diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 4da005fa65..802346b81d 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -2,10 +2,10 @@ // Licensed under the GNU General Public License, version 2 or higher. // Refer to the license.txt file included. - -#include "XInput2.h" -#include #include +#include + +#include "InputCommon/ControllerInterface/Xlib/XInput2.h" // This is an input plugin using the XInput 2.0 extension to the X11 protocol, // loosely based on the old XLib plugin. (Has nothing to do with the XInput diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 4357ee9b5a..2714b70221 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -6,14 +6,14 @@ #pragma once -#include "../Device.h" - extern "C" { +#include #include #include -#include } +#include "InputCommon/ControllerInterface/Device.h" + namespace ciface { namespace XInput2 diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index e507b88c9f..0d2bdab8f8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -1,7 +1,7 @@ -#include "Xlib.h" - #include +#include "InputCommon/ControllerInterface/Xlib/Xlib.h" + namespace ciface { namespace Xlib diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index ed2e3098b4..9c506f67fe 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -1,9 +1,9 @@ #pragma once -#include "../Device.h" - -#include #include +#include + +#include "InputCommon/ControllerInterface/Device.h" namespace ciface { diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index e3e6d318af..859036c69e 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "InputConfig.h" -#include "CommonPaths.h" -#include "../Core/ConfigManager.h" -#include "../Core/HW/Wiimote.h" +#include "Common/CommonPaths.h" +#include "Core/ConfigManager.h" +#include "Core/HW/Wiimote.h" +#include "InputCommon/InputConfig.h" InputPlugin::~InputPlugin() { diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index 8fb284fc66..42a5b7b12f 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -4,15 +4,15 @@ #pragma once -#include "Thread.h" -#include "FileUtil.h" -#include "IniFile.h" - -#include "ControllerInterface/ControllerInterface.h" -#include "ControllerEmu.h" - -#include #include +#include + +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Common/Thread.h" + +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" // InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote // which are not even plugins anymore. diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp index 79b4fc020c..a50dbc17ca 100644 --- a/Source/Core/InputCommon/UDPWiimote.cpp +++ b/Source/Core/InputCommon/UDPWiimote.cpp @@ -2,7 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UDPWiimote.h" +#include +#include +#include +#include +#include +#include + +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "InputCommon/UDPWiimote.h" #ifdef _WIN32 @@ -41,15 +51,6 @@ #endif -#include "Thread.h" -#include "Timer.h" - -#include -#include -#include -#include -#include -#include struct UDPWiimote::_d { diff --git a/Source/Core/InputCommon/UDPWiimote.h b/Source/Core/InputCommon/UDPWiimote.h index 8d57c703ce..82f9635aea 100644 --- a/Source/Core/InputCommon/UDPWiimote.h +++ b/Source/Core/InputCommon/UDPWiimote.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" #define UDPWM_B1 (1<<0) #define UDPWM_B2 (1<<1) diff --git a/Source/Core/InputCommon/UDPWrapper.cpp b/Source/Core/InputCommon/UDPWrapper.cpp index 1db21086e4..19eb619679 100644 --- a/Source/Core/InputCommon/UDPWrapper.cpp +++ b/Source/Core/InputCommon/UDPWrapper.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UDPWrapper.h" +#include +#include +#include -#include -#include -#include +#include "InputCommon/UDPWrapper.h" const std::string DefaultPort(const int index) { diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h index 42b23f45d5..11a5ddb464 100644 --- a/Source/Core/InputCommon/UDPWrapper.h +++ b/Source/Core/InputCommon/UDPWrapper.h @@ -4,13 +4,13 @@ #pragma once -#include "UDPWiimote.h" - -#include "Common.h" -#include "ControllerEmu.h" -#include "IniFile.h" #include +#include "Common/Common.h" +#include "Common/IniFile.h" +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/UDPWiimote.h" + class UDPWrapper : public ControllerEmu::ControlGroup { public: diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp index 9b39f31d58..c6dce96a7b 100644 --- a/Source/Core/InputCommon/X11InputBase.cpp +++ b/Source/Core/InputCommon/X11InputBase.cpp @@ -2,10 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "X11InputBase.h" -#include -#include +#include +#include #include + +#include "InputCommon/X11InputBase.h" + namespace InputCommon { #if defined(HAVE_WX) && HAVE_WX diff --git a/Source/Core/InputCommon/X11InputBase.h b/Source/Core/InputCommon/X11InputBase.h index b2b917a7cf..dce3469d9d 100644 --- a/Source/Core/InputCommon/X11InputBase.h +++ b/Source/Core/InputCommon/X11InputBase.h @@ -4,14 +4,14 @@ #pragma once -#include "Common.h" - -#include #include +#include #if defined(HAVE_WX) && HAVE_WX #include #endif +#include "Common/Common.h" + namespace InputCommon { #if defined(HAVE_WX) && HAVE_WX diff --git a/Source/Core/InputCommon/stdafx.cpp b/Source/Core/InputCommon/stdafx.cpp index b602b39925..d2ad768558 100644 --- a/Source/Core/InputCommon/stdafx.cpp +++ b/Source/Core/InputCommon/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "InputCommon/stdafx.h" diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index 5434354f37..4575d47f37 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "StringUtil.h" -#include "VideoConfig.h" - -#include "D3DBase.h" -#include "D3DTexture.h" -#include "GfxState.h" +#include "Common/StringUtil.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DTexture.h" +#include "VideoBackends/D3D/GfxState.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h index 7f26cbd3cc..457b62d8d9 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -4,12 +4,13 @@ #pragma once -#include #include #include -#include "Common.h" +#include #include +#include "Common/Common.h" + namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.cpp b/Source/Core/VideoBackends/D3D/D3DBlob.cpp index 26c8c8ba85..79fccd3dcf 100644 --- a/Source/Core/VideoBackends/D3D/D3DBlob.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBlob.cpp @@ -3,7 +3,8 @@ // Refer to the license.txt file included. #include -#include "D3DBlob.h" + +#include "VideoBackends/D3D/D3DBlob.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.h b/Source/Core/VideoBackends/D3D/D3DBlob.h index b91907a1b3..7e00ba689a 100644 --- a/Source/Core/VideoBackends/D3D/D3DBlob.h +++ b/Source/Core/VideoBackends/D3D/D3DBlob.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" struct ID3D10Blob; diff --git a/Source/Core/VideoBackends/D3D/D3DShader.cpp b/Source/Core/VideoBackends/D3D/D3DShader.cpp index 51a51b7233..21590143e7 100644 --- a/Source/Core/VideoBackends/D3D/D3DShader.cpp +++ b/Source/Core/VideoBackends/D3D/D3DShader.cpp @@ -4,10 +4,9 @@ #include -#include "VideoConfig.h" - -#include "D3DBase.h" -#include "D3DShader.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DShader.h b/Source/Core/VideoBackends/D3D/D3DShader.h index 84fb03aad8..fc0951ab4b 100644 --- a/Source/Core/VideoBackends/D3D/D3DShader.h +++ b/Source/Core/VideoBackends/D3D/D3DShader.h @@ -4,8 +4,8 @@ #pragma once -#include "D3DBase.h" -#include "D3DBlob.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBlob.h" struct ID3D11PixelShader; struct ID3D11VertexShader; diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp index abf34b3cca..f0114cad95 100644 --- a/Source/Core/VideoBackends/D3D/D3DTexture.cpp +++ b/Source/Core/VideoBackends/D3D/D3DTexture.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "D3DBase.h" -#include "D3DTexture.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DTexture.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/D3DUtil.cpp index 26a9b38af9..9dd7f23e39 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.cpp +++ b/Source/Core/VideoBackends/D3D/D3DUtil.cpp @@ -4,12 +4,12 @@ #include -#include "D3DBase.h" -#include "D3DUtil.h" -#include "PixelShaderCache.h" -#include "VertexShaderCache.h" -#include "D3DShader.h" -#include "GfxState.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/GfxState.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/VertexShaderCache.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.h b/Source/Core/VideoBackends/D3D/D3DUtil.h index 653b32a273..c3569fded9 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.h +++ b/Source/Core/VideoBackends/D3D/D3DUtil.h @@ -5,7 +5,8 @@ #pragma once #include -#include + +#include "Common/MathUtil.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 726037a2f3..6b217fd0a1 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -2,16 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoConfig.h" - -#include "D3DBase.h" -#include "D3DUtil.h" -#include "FramebufferManager.h" -#include "PixelShaderCache.h" -#include "Render.h" -#include "VertexShaderCache.h" -#include "XFBEncoder.h" -#include "HW/Memmap.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/FramebufferManager.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoBackends/D3D/XFBEncoder.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.h b/Source/Core/VideoBackends/D3D/FramebufferManager.h index c55ec3c696..28153b5622 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.h +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.h @@ -6,9 +6,8 @@ #include "d3d11.h" -#include "FramebufferManagerBase.h" - -#include "D3DTexture.h" +#include "VideoBackends/D3D/D3DTexture.h" +#include "VideoCommon/FramebufferManagerBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/GfxState.cpp b/Source/Core/VideoBackends/D3D/GfxState.cpp index cc0b74d1e1..c31c45e2ea 100644 --- a/Source/Core/VideoBackends/D3D/GfxState.cpp +++ b/Source/Core/VideoBackends/D3D/GfxState.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Log.h" +#include "Common/Log.h" -#include "D3DBase.h" -#include "GfxState.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/GfxState.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/Globals.h b/Source/Core/VideoBackends/D3D/Globals.h index 5717baee93..9e761b4ee3 100644 --- a/Source/Core/VideoBackends/D3D/Globals.h +++ b/Source/Core/VideoBackends/D3D/Globals.h @@ -4,8 +4,9 @@ #pragma once -#include "Common.h" -#include "VideoConfig.h" -#include "main.h" +#include "Common/Common.h" -#include "VideoCommon.h" +#include "VideoBackends/D3D/main.h" + +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp index 1974a71f0d..b0b71313fa 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "LineGeometryShader.h" - #include -#include "D3DBase.h" -#include "D3DShader.h" -#include "VertexShaderGen.h" + +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/LineGeometryShader.h" +#include "VideoCommon/VertexShaderGen.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.h b/Source/Core/VideoBackends/D3D/LineGeometryShader.h index 987016fe9d..4bcb159314 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" struct ID3D11Buffer; struct ID3D11GeometryShader; diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp index 824778d238..661e1e4609 100644 --- a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "D3DBase.h" -#include "D3DBlob.h" -#include "NativeVertexFormat.h" -#include "VertexManager.h" -#include "VertexShaderCache.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBlob.h" +#include "VideoBackends/D3D/VertexManager.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoCommon/NativeVertexFormat.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp index 0a8243ed5c..3820fb3cb3 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp @@ -2,16 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "PSTextureEncoder.h" - -#include "D3DBase.h" -#include "D3DShader.h" -#include "GfxState.h" -#include "BPMemory.h" -#include "FramebufferManager.h" -#include "Render.h" -#include "HW/Memmap.h" -#include "TextureCache.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/FramebufferManager.h" +#include "VideoBackends/D3D/GfxState.h" +#include "VideoBackends/D3D/PSTextureEncoder.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/TextureCache.h" +#include "VideoCommon/BPMemory.h" // "Static mode" will compile a new EFB encoder shader for every combination of // encoding configurations. It's compatible with Shader Model 4. diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h index 48832535e6..e581775b73 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h @@ -4,7 +4,7 @@ #pragma once -#include "TextureEncoder.h" +#include "VideoBackends/D3D/TextureEncoder.h" struct ID3D11Texture2D; struct ID3D11RenderTargetView; diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/PerfQuery.cpp index c7eb97ee0b..61a501d640 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.cpp +++ b/Source/Core/VideoBackends/D3D/PerfQuery.cpp @@ -1,7 +1,6 @@ -#include "RenderBase.h" - -#include "D3DBase.h" -#include "PerfQuery.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/PerfQuery.h" +#include "VideoCommon/RenderBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/PerfQuery.h index 99c20a373c..c8f9d08008 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.h +++ b/Source/Core/VideoBackends/D3D/PerfQuery.h @@ -1,7 +1,8 @@ #pragma once #include -#include "PerfQueryBase.h" + +#include "VideoCommon/PerfQueryBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp index bb87720891..4c234517a3 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp @@ -2,21 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "LinearDiskCache.h" +#include "Common/FileUtil.h" +#include "Common/LinearDiskCache.h" -#include "Debugger.h" -#include "Statistics.h" -#include "VideoConfig.h" +#include "Core/ConfigManager.h" -#include "D3DBase.h" -#include "D3DShader.h" -#include "Globals.h" -#include "PixelShaderGen.h" -#include "PixelShaderCache.h" -#include "PixelShaderManager.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/Globals.h" +#include "VideoBackends/D3D/PixelShaderCache.h" + +#include "VideoCommon/Debugger.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoConfig.h" -#include "ConfigManager.h" extern int frameCount; diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.h b/Source/Core/VideoBackends/D3D/PixelShaderCache.h index dee930ccfe..26981dc481 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.h +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h @@ -4,12 +4,11 @@ #pragma once -#include "PixelShaderGen.h" - #include - #include +#include "VideoCommon/PixelShaderGen.h" + enum DSTALPHA_MODE; namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp b/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp index d8dc17317b..5e7cb5eda6 100644 --- a/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp +++ b/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "PointGeometryShader.h" - #include -#include "D3DBase.h" -#include "D3DShader.h" -#include "VertexShaderGen.h" + +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/PointGeometryShader.h" +#include "VideoCommon/VertexShaderGen.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.h b/Source/Core/VideoBackends/D3D/PointGeometryShader.h index 1b1c5812c1..b24f73d486 100644 --- a/Source/Core/VideoBackends/D3D/PointGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/PointGeometryShader.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" struct ID3D11Buffer; struct ID3D11GeometryShader; diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index f9b40dddbd..23467f2406 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -4,35 +4,36 @@ #include #include - -#include "Timer.h" - -#include "EmuWindow.h" -#include "Fifo.h" -#include "OnScreenDisplay.h" -#include "PixelEngine.h" -#include "Statistics.h" -#include "VertexShaderManager.h" -#include "VideoConfig.h" - -#include "D3DBase.h" -#include "D3DUtil.h" -#include "FramebufferManager.h" -#include "GfxState.h" -#include "PixelShaderCache.h" -#include "Render.h" -#include "TextureCache.h" -#include "VertexShaderCache.h" -#include "Core.h" -#include "Movie.h" -#include "Television.h" -#include "Host.h" -#include "BPFunctions.h" -#include "AVIDump.h" -#include "FPSCounter.h" -#include "ConfigManager.h" #include -#include "ImageWrite.h" + +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Movie.h" + +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/FramebufferManager.h" +#include "VideoBackends/D3D/GfxState.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/Television.h" +#include "VideoBackends/D3D/TextureCache.h" +#include "VideoBackends/D3D/VertexShaderCache.h" + +#include "VideoCommon/AVIDump.h" +#include "VideoCommon/BPFunctions.h" +#include "VideoCommon/EmuWindow.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/FPSCounter.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/Render.h index 5c5a922cf1..b5948164d4 100644 --- a/Source/Core/VideoBackends/D3D/Render.h +++ b/Source/Core/VideoBackends/D3D/Render.h @@ -1,6 +1,6 @@ #pragma once -#include "RenderBase.h" +#include "VideoCommon/RenderBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/Television.cpp b/Source/Core/VideoBackends/D3D/Television.cpp index 0f1cf62cf0..816fe32a3a 100644 --- a/Source/Core/VideoBackends/D3D/Television.cpp +++ b/Source/Core/VideoBackends/D3D/Television.cpp @@ -2,16 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Television.h" - -#include "VideoConfig.h" -#include "D3DBase.h" -#include "D3DShader.h" -#include "D3DUtil.h" -#include "VertexShaderCache.h" -#include "HW/Memmap.h" #include +#include "Core/HW/Memmap.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/Television.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoCommon/VideoConfig.h" + namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/Television.h b/Source/Core/VideoBackends/D3D/Television.h index e6f0c42f84..61f0e3f5f6 100644 --- a/Source/Core/VideoBackends/D3D/Television.h +++ b/Source/Core/VideoBackends/D3D/Television.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" struct ID3D11Texture2D; struct ID3D11ShaderResourceView; diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index 27bee7240e..8e616582ca 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -2,19 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "RenderBase.h" - -#include "D3DBase.h" -#include "D3DUtil.h" -#include "FramebufferManager.h" -#include "PixelShaderCache.h" -#include "TextureCache.h" -#include "VertexShaderCache.h" -#include "TextureEncoder.h" -#include "PSTextureEncoder.h" -#include "HW/Memmap.h" -#include "VideoConfig.h" -#include "ImageWrite.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/FramebufferManager.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/PSTextureEncoder.h" +#include "VideoBackends/D3D/TextureCache.h" +#include "VideoBackends/D3D/TextureEncoder.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/TextureCache.h b/Source/Core/VideoBackends/D3D/TextureCache.h index 91603bc56d..991bbe15cf 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.h +++ b/Source/Core/VideoBackends/D3D/TextureCache.h @@ -4,9 +4,8 @@ #pragma once -#include "TextureCacheBase.h" - -#include "D3DTexture.h" +#include "VideoBackends/D3D/D3DTexture.h" +#include "VideoCommon/TextureCacheBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h index d43f4cefeb..56f4092ea8 100644 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp index a85c85027d..06ade13fa2 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp @@ -2,22 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "D3DBase.h" -#include "PixelShaderCache.h" -#include "VertexManager.h" -#include "VertexShaderCache.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/VertexManager.h" +#include "VideoBackends/D3D/VertexShaderCache.h" -#include "BPMemory.h" -#include "Debugger.h" -#include "IndexGenerator.h" -#include "MainBase.h" -#include "PixelShaderManager.h" -#include "RenderBase.h" -#include "Render.h" -#include "Statistics.h" -#include "TextureCacheBase.h" -#include "VertexShaderManager.h" -#include "VideoConfig.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/MainBase.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" // internal state for loading vertices extern NativeVertexFormat *g_nativeVertexFmt; diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index fea814bac2..e74514d85c 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -4,9 +4,9 @@ #pragma once -#include "VertexManagerBase.h" -#include "LineGeometryShader.h" -#include "PointGeometryShader.h" +#include "VideoBackends/D3D/LineGeometryShader.h" +#include "VideoBackends/D3D/PointGeometryShader.h" +#include "VideoCommon/VertexManagerBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp index b3a399ed5e..7d35d84a36 100644 --- a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "LinearDiskCache.h" +#include "Common/FileUtil.h" +#include "Common/LinearDiskCache.h" -#include "Debugger.h" -#include "Statistics.h" -#include "VertexShaderGen.h" +#include "Core/ConfigManager.h" -#include "D3DShader.h" -#include "Globals.h" -#include "VertexShaderCache.h" -#include "VertexShaderManager.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/Globals.h" +#include "VideoBackends/D3D/VertexShaderCache.h" -#include "ConfigManager.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VertexShaderManager.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.h b/Source/Core/VideoBackends/D3D/VertexShaderCache.h index 8b28790157..0c9c739f6b 100644 --- a/Source/Core/VideoBackends/D3D/VertexShaderCache.h +++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.h @@ -4,13 +4,13 @@ #pragma once -#include "VertexShaderGen.h" - -#include "D3DBase.h" -#include "D3DBlob.h" - #include +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBlob.h" + +#include "VideoCommon/VertexShaderGen.h" + namespace DX11 { class VertexShaderCache diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index 15224c478b..a158aced0b 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -1,6 +1,6 @@ #pragma once -#include "VideoBackendBase.h" +#include "VideoCommon/VideoBackendBase.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp index bc6c66d29b..25d69aed12 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp @@ -2,14 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "XFBEncoder.h" - -#include "D3DBase.h" -#include "D3DBlob.h" -#include "D3DShader.h" -#include "Render.h" -#include "GfxState.h" -#include "FramebufferManager.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBlob.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoBackends/D3D/FramebufferManager.h" +#include "VideoBackends/D3D/GfxState.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/XFBEncoder.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.h b/Source/Core/VideoBackends/D3D/XFBEncoder.h index 655059cd56..b5ac5200a6 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.h +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" struct ID3D11Texture2D; struct ID3D11RenderTargetView; diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 2c8179c91d..2fe48f3a06 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -4,39 +4,39 @@ #include -#include "LogManager.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Common/LogManager.h" -#include "BPStructs.h" -#include "CommandProcessor.h" -#include "Fifo.h" -#include "OnScreenDisplay.h" -#include "OpcodeDecoding.h" -#include "PixelEngine.h" -#include "PixelShaderManager.h" -#include "VideoConfig.h" -#include "VertexLoaderManager.h" -#include "VertexShaderManager.h" -#include "Core.h" -#include "Host.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" -#include "Debugger/DebuggerPanel.h" -#include "EmuWindow.h" -#include "IndexGenerator.h" -#include "FileUtil.h" -#include "Globals.h" -#include "IniFile.h" -#include "VideoConfigDiag.h" +#include "DolphinWX/VideoConfigDiag.h" +#include "DolphinWX/Debugger/DebuggerPanel.h" -#include "D3DUtil.h" -#include "D3DBase.h" -#include "PerfQuery.h" -#include "PixelShaderCache.h" -#include "TextureCache.h" -#include "VertexManager.h" -#include "VertexShaderCache.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DUtil.h" +#include "VideoBackends/D3D/Globals.h" +#include "VideoBackends/D3D/PerfQuery.h" +#include "VideoBackends/D3D/PixelShaderCache.h" +#include "VideoBackends/D3D/TextureCache.h" +#include "VideoBackends/D3D/VertexManager.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoBackends/D3D/VideoBackend.h" -#include "VideoBackend.h" -#include "ConfigManager.h" +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/EmuWindow.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/main.h b/Source/Core/VideoBackends/D3D/main.h index 4932c0e367..023ad44ad1 100644 --- a/Source/Core/VideoBackends/D3D/main.h +++ b/Source/Core/VideoBackends/D3D/main.h @@ -4,5 +4,5 @@ #pragma once -#include "Render.h" -#include "MainBase.h" +#include "VideoBackends/D3D/Render.h" +#include "VideoCommon/MainBase.h" diff --git a/Source/Core/VideoBackends/D3D/stdafx.cpp b/Source/Core/VideoBackends/D3D/stdafx.cpp index 7c408e10b9..195c34a7fe 100644 --- a/Source/Core/VideoBackends/D3D/stdafx.cpp +++ b/Source/Core/VideoBackends/D3D/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" \ No newline at end of file +#include "VideoBackends/D3D/stdafx.h" \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index d2169a7c91..3fca224bb8 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -2,15 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" -#include "FramebufferManager.h" -#include "VertexShaderGen.h" -#include "OnScreenDisplay.h" -#include "DriverDetails.h" +#include "Core/HW/Memmap.h" -#include "TextureConverter.h" -#include "Render.h" -#include "HW/Memmap.h" +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/TextureConverter.h" + +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/VertexShaderGen.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index 34c8b80a8c..db63955cc4 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.h +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h @@ -4,10 +4,11 @@ #pragma once -#include "GLUtil.h" -#include "FramebufferManagerBase.h" -#include "ProgramShaderCache.h" -#include "Render.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" + +#include "VideoCommon/FramebufferManagerBase.h" // On the GameCube, the game sends a request for the graphics processor to // transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h index e765d6d53a..32ebf8bb06 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLCLEARDEPTHFPROC glClearDepthf; extern PFNGLDEPTHRANGEFPROC glDepthRangef; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h index 4e80990b47..990dc72abb 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed; extern PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h index 328f9269ab..02644c14ae 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBUFFERSTORAGEPROC glBufferStorage; extern PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h index 75ab8c7528..16152998b4 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB; extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h index 360409065c..bec2598680 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex; extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h index d3ac931ea6..96841a224e 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h index 88bed7780a..fc4214bf2e 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary; extern PFNGLPROGRAMBINARYPROC glProgramBinary; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h index 61ce3b08a9..6cde03489f 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange; extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h index 7afdb0d259..b2d3b15471 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h index 5bcba282ec..75031aa053 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBINDSAMPLERPROC glBindSampler; extern PFNGLDELETESAMPLERSPROC glDeleteSamplers; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h index 154ae14ee0..bbdf2f2c07 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync; extern PFNGLDELETESYNCPROC glDeleteSync; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h index 284073287d..0fd26bac25 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBINDBUFFERBASEPROC glBindBufferBase; extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h index 5807814939..a8ef567e0c 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray; extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h index 9b81bede4a..4c6b7342e0 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLDEPTHRANGEARRAYVPROC glDepthRangeArrayv; extern PFNGLDEPTHRANGEINDEXEDPROC glDepthRangeIndexed; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 44fea1b369..3e690cc8d0 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GLExtensions.h" -#include "Log.h" +#include +#include + +#include "Common/Log.h" +#include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #if defined(__linux__) || defined(__APPLE__) #include #endif -#include -#include // gl_1_1 PFNGLCLEARINDEXPROC glClearIndex; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index caf88efd94..442fda9e78 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -4,34 +4,34 @@ #include -#include "GLInterface/GLInterface.h" +#include "DolphinWX/GLInterface/GLInterface.h" -#include "gl_1_1.h" -#include "gl_1_2.h" -#include "gl_1_3.h" -#include "gl_1_4.h" -#include "gl_1_5.h" -#include "gl_2_0.h" -#include "gl_3_0.h" -#include "gl_3_1.h" -#include "gl_3_2.h" -#include "ARB_uniform_buffer_object.h" -#include "ARB_sampler_objects.h" -#include "ARB_map_buffer_range.h" -#include "ARB_vertex_array_object.h" -#include "ARB_framebuffer_object.h" -#include "ARB_get_program_binary.h" -#include "ARB_sync.h" -#include "ARB_ES2_compatibility.h" -#include "NV_primitive_restart.h" -#include "ARB_blend_func_extended.h" -#include "ARB_viewport_array.h" -#include "ARB_draw_elements_base_vertex.h" -#include "NV_framebuffer_multisample_coverage.h" -#include "ARB_sample_shading.h" -#include "ARB_debug_output.h" -#include "KHR_debug.h" -#include "ARB_buffer_storage.h" +#include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h" +#include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h" +#include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h" +#include "VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h" +#include "VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h" +#include "VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h" +#include "VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h" +#include "VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h" +#include "VideoBackends/OGL/GLExtensions/ARB_sample_shading.h" +#include "VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h" +#include "VideoBackends/OGL/GLExtensions/ARB_sync.h" +#include "VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h" +#include "VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h" +#include "VideoBackends/OGL/GLExtensions/ARB_viewport_array.h" +#include "VideoBackends/OGL/GLExtensions/gl_1_1.h" +#include "VideoBackends/OGL/GLExtensions/gl_1_2.h" +#include "VideoBackends/OGL/GLExtensions/gl_1_3.h" +#include "VideoBackends/OGL/GLExtensions/gl_1_4.h" +#include "VideoBackends/OGL/GLExtensions/gl_1_5.h" +#include "VideoBackends/OGL/GLExtensions/gl_2_0.h" +#include "VideoBackends/OGL/GLExtensions/gl_3_0.h" +#include "VideoBackends/OGL/GLExtensions/gl_3_1.h" +#include "VideoBackends/OGL/GLExtensions/gl_3_2.h" +#include "VideoBackends/OGL/GLExtensions/KHR_debug.h" +#include "VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h" +#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h" namespace GLExtensions { diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h b/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h index 71cda102a4..e85776c3c1 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" #ifndef GL_VERSION_4_3 diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h b/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h index 0db71cd489..7a1747d70e 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" #define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB #define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h b/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h index 3645f495e6..09b092179b 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" #define GL_PRIMITIVE_RESTART_NV 0x8558 #define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h index ec5e37b85a..0efd21f370 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" typedef void (GLAPIENTRY * PFNGLCLEARINDEXPROC) ( GLfloat c ); typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h index 4023aded5e..d502bcd6a1 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D; extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h index 4e4c7dd8f5..2c1cd78522 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLACTIVETEXTUREARBPROC glActiveTexture; extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTexture; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h index d9870d087c..d88c0f3af8 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" // These two are provided by ARB_imaging as well extern PFNGLBLENDCOLORPROC glBlendColor; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h index 09a252fd06..fc741930c5 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBEGINQUERYPROC glBeginQuery; extern PFNGLBINDBUFFERPROC glBindBuffer; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h index 9fc4628ede..93a489650d 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLATTACHSHADERPROC glAttachShader; extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h index 27f4678254..ce6ece39e4 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender; extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h index ff2ff10f1c..1822dd5a9f 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h index 90a9d5d159..18386f725c 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "gl_common.h" +#include "VideoBackends/OGL/GLExtensions/gl_common.h" extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture; extern PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v; diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index 73df97389a..abe2505e74 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" -#include "VideoConfig.h" -#include "IniFile.h" -#include "Core.h" -#include "VideoBackend.h" -#include "ConfigManager.h" +#include "Common/IniFile.h" -#include "Render.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" -#include "GLUtil.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/VideoBackend.h" + +#include "VideoCommon/VideoConfig.h" GLWindow GLWin; cInterfaceBase *GLInterface; diff --git a/Source/Core/VideoBackends/OGL/GLUtil.h b/Source/Core/VideoBackends/OGL/GLUtil.h index 67fa8f237e..a46e381586 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.h +++ b/Source/Core/VideoBackends/OGL/GLUtil.h @@ -4,10 +4,10 @@ #pragma once -#include "VideoConfig.h" -#include "MathUtil.h" -#include "GLInterface/GLInterface.h" -#include "GLExtensions/GLExtensions.h" +#include "Common/MathUtil.h" +#include "DolphinWX/GLInterface/GLInterface.h" +#include "VideoBackends/OGL/GLExtensions/GLExtensions.h" +#include "VideoCommon/VideoConfig.h" #ifndef _WIN32 diff --git a/Source/Core/VideoBackends/OGL/Globals.h b/Source/Core/VideoBackends/OGL/Globals.h index 268322335b..d1f9012716 100644 --- a/Source/Core/VideoBackends/OGL/Globals.h +++ b/Source/Core/VideoBackends/OGL/Globals.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" -#include "VideoConfig.h" +#include "Common/Common.h" -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index 4f3f2ad0d7..dad409e47a 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GLUtil.h" -#include "x64Emitter.h" -#include "x64ABI.h" -#include "MemoryUtil.h" -#include "ProgramShaderCache.h" -#include "VertexShaderGen.h" +#include "Common/MemoryUtil.h" +#include "Common/x64ABI.h" +#include "Common/x64Emitter.h" -#include "CPMemory.h" -#include "NativeVertexFormat.h" -#include "VertexManager.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/VertexManager.h" + +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/VertexShaderGen.h" // Here's some global state. We only use this to keep track of what we've sent to the OpenGL state // machine. diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp index 4f30658a59..8e2de6dd4e 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp +++ b/Source/Core/VideoBackends/OGL/PerfQuery.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GLInterface/GLInterface.h" -#include "RenderBase.h" -#include "GLUtil.h" -#include "PerfQuery.h" +#include "DolphinWX/GLInterface/GLInterface.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/PerfQuery.h" +#include "VideoCommon/RenderBase.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h index 8d4f75aa5a..43534855e3 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.h +++ b/Source/Core/VideoBackends/OGL/PerfQuery.h @@ -1,7 +1,7 @@ #pragma once #include -#include "PerfQueryBase.h" +#include "VideoCommon/PerfQueryBase.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/PostProcessing.cpp index c0460e489a..211cf5d937 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.cpp +++ b/Source/Core/VideoBackends/OGL/PostProcessing.cpp @@ -2,14 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonPaths.h" -#include "FileUtil.h" -#include "VideoCommon.h" -#include "VideoConfig.h" -#include "GLUtil.h" -#include "PostProcessing.h" -#include "ProgramShaderCache.h" -#include "FramebufferManager.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" + +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/PostProcessing.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" + +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.h b/Source/Core/VideoBackends/OGL/PostProcessing.h index 0cd93116f4..1a6f015bbc 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.h +++ b/Source/Core/VideoBackends/OGL/PostProcessing.h @@ -4,8 +4,8 @@ #pragma once -#include "VideoCommon.h" -#include "GLUtil.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoCommon/VideoCommon.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 6804417938..79826860a7 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -2,16 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ProgramShaderCache.h" -#include "DriverDetails.h" -#include "MathUtil.h" -#include "StreamBuffer.h" -#include "Debugger.h" -#include "Statistics.h" -#include "ImageWrite.h" -#include "Render.h" -#include "PixelShaderManager.h" -#include "VertexShaderManager.h" +#include "Common/MathUtil.h" + +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/StreamBuffer.h" + +#include "VideoCommon/Debugger.h" +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexShaderManager.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index ee3c174ec6..8db3eb7ccb 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -4,13 +4,11 @@ #pragma once -#include "GLUtil.h" - -#include "PixelShaderGen.h" -#include "VertexShaderGen.h" - -#include "LinearDiskCache.h" -#include "ConfigManager.h" +#include "Common/LinearDiskCache.h" +#include "Core/ConfigManager.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/VertexShaderGen.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index d3e4272d28..e5458ee455 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "GLUtil.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/RasterFont.h" -#include "RasterFont.h" -#include "ProgramShaderCache.h" // globals namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 8a07165a13..433b71847a 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -2,63 +2,64 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" -#include "Thread.h" -#include "Atomic.h" - -#include +#include #include #include -#include +#include + +#include "Common/Atomic.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" +#include "Common/Thread.h" +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" + +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/main.h" +#include "VideoBackends/OGL/PostProcessing.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/RasterFont.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/SamplerCache.h" +#include "VideoBackends/OGL/StreamBuffer.h" +#include "VideoBackends/OGL/TextureCache.h" +#include "VideoBackends/OGL/TextureConverter.h" +#include "VideoBackends/OGL/VertexManager.h" + +#include "VideoCommon/BPFunctions.h" +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/FPSCounter.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" -#include "GLUtil.h" #if defined(HAVE_WX) && HAVE_WX -#include "WxUtils.h" +#include "DolphinWX/WxUtils.h" #endif -#include "FileUtil.h" - #ifdef _WIN32 #include #endif -#include "CommonPaths.h" -#include "DriverDetails.h" -#include "VideoConfig.h" -#include "Statistics.h" -#include "ImageWrite.h" -#include "PixelEngine.h" -#include "Render.h" -#include "BPStructs.h" -#include "TextureCache.h" -#include "RasterFont.h" -#include "VertexShaderGen.h" -#include "ProgramShaderCache.h" -#include "VertexShaderManager.h" -#include "VertexLoaderManager.h" -#include "VertexLoader.h" -#include "PostProcessing.h" -#include "TextureConverter.h" -#include "OnScreenDisplay.h" -#include "Timer.h" -#include "StringUtil.h" -#include "FramebufferManager.h" -#include "Fifo.h" -#include "Core.h" -#include "Movie.h" -#include "BPFunctions.h" -#include "FPSCounter.h" -#include "ConfigManager.h" -#include "VertexManager.h" -#include "SamplerCache.h" -#include "StreamBuffer.h" - -#include "main.h" // Local #ifdef _WIN32 -#include "EmuWindow.h" +#include "VideoCommon/EmuWindow.h" #endif #if defined _WIN32 || defined HAVE_LIBAV -#include "AVIDump.h" +#include "VideoCommon/AVIDump.h" #endif diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index fb15462921..d6486c6e22 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -1,6 +1,6 @@ #pragma once -#include "RenderBase.h" +#include "VideoCommon/RenderBase.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp index 01f5959c57..c9bf699843 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.cpp +++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DriverDetails.h" -#include "SamplerCache.h" +#include "VideoBackends/OGL/SamplerCache.h" +#include "VideoCommon/DriverDetails.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index ef470e0758..f8e77a0b93 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -2,8 +2,8 @@ #include -#include "Render.h" -#include "GLUtil.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/Render.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index f21ab60a50..7c9348d157 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -2,13 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" -#include "GLUtil.h" -#include "StreamBuffer.h" -#include "MemoryUtil.h" -#include "Render.h" -#include "DriverDetails.h" -#include "OnScreenDisplay.h" +#include "Common/MemoryUtil.h" + +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/StreamBuffer.h" + +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/OnScreenDisplay.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h index 00e8579a15..78b73e1da3 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h @@ -5,9 +5,9 @@ #pragma once #include -#include "VideoCommon.h" -#include "FramebufferManager.h" -#include "GLUtil.h" +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoCommon/VideoCommon.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index c4a89b004f..29a2a13a27 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -2,11 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include - - #include +#include + #ifdef _WIN32 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set #define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset @@ -19,24 +18,27 @@ #undef _interlockedbittestandreset64 #endif -#include "BPStructs.h" -#include "CommonPaths.h" -#include "FileUtil.h" -#include "FramebufferManager.h" -#include "Globals.h" -#include "Hash.h" -#include "HiresTextures.h" -#include "HW/Memmap.h" -#include "ImageWrite.h" -#include "MemoryUtil.h" -#include "ProgramShaderCache.h" -#include "Render.h" -#include "Statistics.h" -#include "StringUtil.h" -#include "TextureCache.h" -#include "TextureConverter.h" -#include "TextureDecoder.h" -#include "VideoConfig.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/Hash.h" +#include "Common/MemoryUtil.h" +#include "Common/StringUtil.h" + +#include "Core/HW/Memmap.h" + +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/TextureCache.h" +#include "VideoBackends/OGL/TextureConverter.h" + +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/HiresTextures.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoConfig.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index 3c0e421bc7..b358695534 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -6,11 +6,10 @@ #include -#include "VideoCommon.h" -#include "GLUtil.h" -#include "BPStructs.h" - -#include "TextureCacheBase.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VideoCommon.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 08ebde398c..753bd64ada 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -4,18 +4,22 @@ // Fast image conversion using OpenGL shaders. -#include "TextureConverter.h" -#include "TextureConversionShader.h" -#include "TextureCache.h" -#include "ProgramShaderCache.h" -#include "FramebufferManager.h" -#include "Globals.h" -#include "VideoConfig.h" -#include "ImageWrite.h" -#include "Render.h" -#include "FileUtil.h" -#include "HW/Memmap.h" -#include "DriverDetails.h" +#include "Common/FileUtil.h" + +#include "Core/HW/Memmap.h" + +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/TextureCache.h" +#include "VideoBackends/OGL/TextureConverter.h" + +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/TextureConversionShader.h" +#include "VideoCommon/VideoConfig.h" + namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.h b/Source/Core/VideoBackends/OGL/TextureConverter.h index f86241e5ff..4917528b4a 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.h +++ b/Source/Core/VideoBackends/OGL/TextureConverter.h @@ -4,8 +4,8 @@ #pragma once -#include "VideoCommon.h" -#include "GLUtil.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoCommon/VideoCommon.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index 670dd7d8a0..4af1a48953 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -2,33 +2,31 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" - #include #include -#include "Fifo.h" +#include "Common/FileUtil.h" +#include "Common/MemoryUtil.h" -#include "DriverDetails.h" -#include "VideoConfig.h" -#include "Statistics.h" -#include "MemoryUtil.h" -#include "Render.h" -#include "ImageWrite.h" -#include "BPMemory.h" -#include "TextureCache.h" -#include "PixelShaderManager.h" -#include "VertexShaderManager.h" -#include "ProgramShaderCache.h" -#include "VertexShaderGen.h" -#include "VertexLoader.h" -#include "VertexManager.h" -#include "IndexGenerator.h" -#include "FileUtil.h" -#include "StreamBuffer.h" -#include "Render.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/main.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/StreamBuffer.h" +#include "VideoBackends/OGL/TextureCache.h" +#include "VideoBackends/OGL/VertexManager.h" -#include "main.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" // internal state for loading vertices extern NativeVertexFormat *g_nativeVertexFmt; diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index ded0ff2796..aec0712c2f 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -4,9 +4,8 @@ #pragma once -#include "CPMemory.h" - -#include "VertexManagerBase.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/VertexManagerBase.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index 761772a8ed..8b41b006fe 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -1,6 +1,6 @@ #pragma once -#include "VideoBackendBase.h" +#include "VideoCommon/VideoBackendBase.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 184b56724d..b37f428531 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -36,57 +36,59 @@ Make AA apply instantly during gameplay if possible */ -#include "Globals.h" -#include "Atomic.h" -#include "CommonPaths.h" -#include "Thread.h" -#include "LogManager.h" - -#include #include +#include + +#include "Common/Atomic.h" +#include "Common/CommonPaths.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" + +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" + +#include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/PerfQuery.h" +#include "VideoBackends/OGL/PostProcessing.h" +#include "VideoBackends/OGL/ProgramShaderCache.h" +#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/SamplerCache.h" +#include "VideoBackends/OGL/TextureCache.h" +#include "VideoBackends/OGL/TextureConverter.h" +#include "VideoBackends/OGL/VertexManager.h" +#include "VideoBackends/OGL/VideoBackend.h" + +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/MainBase.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoState.h" + #ifdef _WIN32 -#include "EmuWindow.h" -#include "IniFile.h" +#include "Common/IniFile.h" +#include "VideoCommon/EmuWindow.h" #endif #if defined(HAVE_WX) && HAVE_WX -#include "VideoConfigDiag.h" -#include "Debugger/DebuggerPanel.h" +#include "DolphinWX/VideoConfigDiag.h" +#include "DolphinWX/Debugger/DebuggerPanel.h" #endif // HAVE_WX -#include "MainBase.h" -#include "VideoConfig.h" -#include "LookUpTables.h" -#include "ImageWrite.h" -#include "Render.h" -#include "GLUtil.h" -#include "Fifo.h" -#include "OpcodeDecoding.h" -#include "TextureCache.h" -#include "BPStructs.h" -#include "VertexLoader.h" -#include "VertexLoaderManager.h" -#include "VertexManager.h" -#include "PixelShaderManager.h" -#include "VertexShaderManager.h" -#include "ProgramShaderCache.h" -#include "CommandProcessor.h" -#include "PixelEngine.h" -#include "TextureConverter.h" -#include "PostProcessing.h" -#include "OnScreenDisplay.h" -#include "FramebufferManager.h" -#include "Core.h" -#include "Host.h" -#include "SamplerCache.h" -#include "PerfQuery.h" - -#include "VideoState.h" -#include "IndexGenerator.h" -#include "VideoBackend.h" -#include "ConfigManager.h" - namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/main.h b/Source/Core/VideoBackends/OGL/main.h index 7ea6077d30..0866e823a7 100644 --- a/Source/Core/VideoBackends/OGL/main.h +++ b/Source/Core/VideoBackends/OGL/main.h @@ -4,4 +4,4 @@ #pragma once -#include "MainBase.h" +#include "VideoCommon/MainBase.h" diff --git a/Source/Core/VideoBackends/OGL/stdafx.cpp b/Source/Core/VideoBackends/OGL/stdafx.cpp index 7c408e10b9..a4735a1513 100644 --- a/Source/Core/VideoBackends/OGL/stdafx.cpp +++ b/Source/Core/VideoBackends/OGL/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" \ No newline at end of file +#include "VideoBackends/OGL/stdafx.h" \ No newline at end of file diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index 946e792b3f..738b909fc0 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoCommon.h" -#include "TextureDecoder.h" +#include "Core/Core.h" +#include "Core/HW/Memmap.h" -#include "BPMemLoader.h" -#include "EfbCopy.h" -#include "Rasterizer.h" -#include "SWPixelEngine.h" -#include "Tev.h" -#include "HW/Memmap.h" -#include "Core.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/EfbCopy.h" +#include "VideoBackends/Software/Rasterizer.h" +#include "VideoBackends/Software/SWPixelEngine.h" +#include "VideoBackends/Software/Tev.h" + +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoCommon.h" void InitBPMemory() diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h index 6ea09293cf..5046e3daed 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.h +++ b/Source/Core/VideoBackends/Software/BPMemLoader.h @@ -5,8 +5,8 @@ #pragma once -#include "Common.h" -#include "BPMemory.h" +#include "Common/Common.h" +#include "VideoCommon/BPMemory.h" void InitBPMemory(); void SWBPWritten(int address, int newvalue); diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.cpp b/Source/Core/VideoBackends/Software/CPMemLoader.cpp index 98734deeb5..cb57ea5ccf 100644 --- a/Source/Core/VideoBackends/Software/CPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/CPMemLoader.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoCommon.h" - -#include "CPMemLoader.h" -#include "HW/Memmap.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoCommon/VideoCommon.h" void SWLoadCPReg(u32 sub_cmd, u32 value) diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.h b/Source/Core/VideoBackends/Software/CPMemLoader.h index a08fac2a73..4606a9bb59 100644 --- a/Source/Core/VideoBackends/Software/CPMemLoader.h +++ b/Source/Core/VideoBackends/Software/CPMemLoader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" -#include "CPMemory.h" +#include "Common/Common.h" +#include "VideoCommon/CPMemory.h" void SWLoadCPReg(u32 sub_cmd, u32 value); diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index 6d6069b262..976bbeb104 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -35,12 +35,12 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Clipper.h" -#include "Rasterizer.h" -#include "NativeVertexFormat.h" -#include "XFMemLoader.h" -#include "BPMemLoader.h" -#include "SWStatistics.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/Clipper.h" +#include "VideoBackends/Software/NativeVertexFormat.h" +#include "VideoBackends/Software/Rasterizer.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/XFMemLoader.h" namespace Clipper diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h index acf32b32ff..a7e75277ae 100644 --- a/Source/Core/VideoBackends/Software/Clipper.h +++ b/Source/Core/VideoBackends/Software/Clipper.h @@ -4,10 +4,9 @@ #pragma once -#include "Common.h" -#include "NativeVertexFormat.h" -#include "ChunkFile.h" - +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "VideoBackends/Software/NativeVertexFormat.h" namespace Clipper { diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 75c6c08ada..95303d4c2f 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -2,19 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/TextureSampler.h" + +#include "VideoCommon/ImageWrite.h" -#include "DebugUtil.h" -#include "BPMemLoader.h" -#include "TextureSampler.h" -#include "SWVideoConfig.h" -#include "EfbInterface.h" -#include "SWStatistics.h" -#include "HwRasterizer.h" -#include "StringUtil.h" -#include "SWCommandProcessor.h" -#include "ImageWrite.h" -#include "FileUtil.h" namespace DebugUtil { diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp index 1f042b8060..b800ba8ee2 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.cpp +++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "BPMemLoader.h" -#include "EfbCopy.h" -#include "EfbInterface.h" -#include "SWRenderer.h" -#include "TextureEncoder.h" -#include "SWStatistics.h" -#include "SWVideoConfig.h" -#include "DebugUtil.h" -#include "HwRasterizer.h" -#include "SWCommandProcessor.h" -#include "HW/Memmap.h" -#include "Core.h" +#include "Core/Core.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/EfbCopy.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWRenderer.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/TextureEncoder.h" static const float s_gammaLUT[] = { diff --git a/Source/Core/VideoBackends/Software/EfbCopy.h b/Source/Core/VideoBackends/Software/EfbCopy.h index 3a8d7d7ad6..9c7786202e 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.h +++ b/Source/Core/VideoBackends/Software/EfbCopy.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace EfbCopy { diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index a4b6a98993..ea066934d8 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -2,13 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" +#include "Core/HW/Memmap.h" -#include "EfbInterface.h" -#include "BPMemLoader.h" -#include "LookUpTables.h" -#include "SWPixelEngine.h" -#include "HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/SWPixelEngine.h" + +#include "VideoCommon/LookUpTables.h" u8 efb[EFB_WIDTH*EFB_HEIGHT*6]; diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h index 59ef834a03..da37bef244 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.h +++ b/Source/Core/VideoBackends/Software/EfbInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" namespace EfbInterface { diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/HwRasterizer.cpp index 5c9a748bc6..e140199c43 100644 --- a/Source/Core/VideoBackends/Software/HwRasterizer.cpp +++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "MemoryUtil.h" +#include "Common/Common.h" +#include "Common/MemoryUtil.h" -#include +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/NativeVertexFormat.h" -#include "BPMemLoader.h" -#include "HwRasterizer.h" -#include "NativeVertexFormat.h" -#include "DebugUtil.h" +#include "VideoCommon/VideoCommon.h" #define TEMP_SIZE (1024*1024*4) diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.h b/Source/Core/VideoBackends/Software/HwRasterizer.h index f9c5810389..cad3fe07a5 100644 --- a/Source/Core/VideoBackends/Software/HwRasterizer.h +++ b/Source/Core/VideoBackends/Software/HwRasterizer.h @@ -6,8 +6,8 @@ #include -#include "BPMemLoader.h" -#include "../OGL/GLUtil.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/Software/BPMemLoader.h" struct OutputVertexData; diff --git a/Source/Core/VideoBackends/Software/NativeVertexFormat.h b/Source/Core/VideoBackends/Software/NativeVertexFormat.h index a6e22f9850..fe6d336609 100644 --- a/Source/Core/VideoBackends/Software/NativeVertexFormat.h +++ b/Source/Core/VideoBackends/Software/NativeVertexFormat.h @@ -4,8 +4,8 @@ #pragma once -#include "Vec3.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "VideoBackends/Software/Vec3.h" #ifdef WIN32 #define LOADERDECL __cdecl diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index ea2b220d53..069876741d 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -2,21 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include "DataReader.h" - -#include "OpcodeDecoder.h" -#include "BPMemLoader.h" -#include "CPMemLoader.h" -#include "XFMemLoader.h" -#include "SWVertexLoader.h" -#include "SWStatistics.h" -#include "DebugUtil.h" -#include "SWCommandProcessor.h" -#include "CPMemLoader.h" -#include "SWVideoConfig.h" -#include "HW/Memmap.h" +#include "Common/Common.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/OpcodeDecoder.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVertexLoader.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/XFMemLoader.h" +#include "VideoCommon/DataReader.h" typedef void (*DecodingFunction)(u32); diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h index 4ba83507de..3d33b18d40 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h @@ -4,8 +4,8 @@ #pragma once -#include "CommonTypes.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" namespace OpcodeDecoder { diff --git a/Source/Core/VideoBackends/Software/RasterFont.cpp b/Source/Core/VideoBackends/Software/RasterFont.cpp index 461ce7d486..7876ac4585 100644 --- a/Source/Core/VideoBackends/Software/RasterFont.cpp +++ b/Source/Core/VideoBackends/Software/RasterFont.cpp @@ -2,12 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "../OGL/GLUtil.h" - #include -#include "RasterFont.h" -// globals +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/Software/RasterFont.h" const GLubyte rasters[][13] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 377a437c64..8c59455531 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -2,17 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "Rasterizer.h" -#include "HwRasterizer.h" -#include "EfbInterface.h" -#include "BPMemLoader.h" -#include "XFMemLoader.h" -#include "Tev.h" -#include "SWPixelEngine.h" -#include "SWStatistics.h" -#include "SWVideoConfig.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/Rasterizer.h" +#include "VideoBackends/Software/SWPixelEngine.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/Tev.h" +#include "VideoBackends/Software/XFMemLoader.h" #define BLOCK_SIZE 2 diff --git a/Source/Core/VideoBackends/Software/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h index a4599145b0..7d64b8aa5d 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.h +++ b/Source/Core/VideoBackends/Software/Rasterizer.h @@ -4,8 +4,8 @@ #pragma once -#include "NativeVertexFormat.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "VideoBackends/Software/NativeVertexFormat.h" namespace Rasterizer { diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index 450ce5712a..bf37b47b8e 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -2,21 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "Thread.h" -#include "Atomic.h" -#include "ConfigManager.h" -#include "Core.h" -#include "CoreTiming.h" -#include "HW/Memmap.h" -#include "HW/MMIO.h" -#include "HW/ProcessorInterface.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "Common/Thread.h" -#include "VideoBackend.h" -#include "SWCommandProcessor.h" -#include "ChunkFile.h" -#include "MathUtil.h" -#include "OpcodeDecoder.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" + +#include "VideoBackends/Software/OpcodeDecoder.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/VideoBackend.h" namespace SWCommandProcessor diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h index 92ca728230..885ef6cff5 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoBackends/Software/SWPixelEngine.cpp b/Source/Core/VideoBackends/Software/SWPixelEngine.cpp index e32384982e..bc92575da0 100644 --- a/Source/Core/VideoBackends/Software/SWPixelEngine.cpp +++ b/Source/Core/VideoBackends/Software/SWPixelEngine.cpp @@ -2,20 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!! +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" -#include "Common.h" -#include "ChunkFile.h" -#include "CoreTiming.h" -#include "ConfigManager.h" -#include "HW/MMIO.h" -#include "HW/ProcessorInterface.h" - -#include "SWPixelEngine.h" -#include "SWCommandProcessor.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWPixelEngine.h" namespace SWPixelEngine diff --git a/Source/Core/VideoBackends/Software/SWPixelEngine.h b/Source/Core/VideoBackends/Software/SWPixelEngine.h index 37f26be78e..93cab0ba9d 100644 --- a/Source/Core/VideoBackends/Software/SWPixelEngine.h +++ b/Source/Core/VideoBackends/Software/SWPixelEngine.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "VideoCommon.h" +#include "Common/Common.h" +#include "VideoCommon/VideoCommon.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 7809c7a99c..c56390ba90 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -2,17 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include "../OGL/GLUtil.h" -#include "Core.h" -#include "ImageWrite.h" -#include "RasterFont.h" -#include "SWRenderer.h" -#include "SWStatistics.h" -#include "SWCommandProcessor.h" - -#include "OnScreenDisplay.h" +#include "Common/Common.h" +#include "Core/Core.h" +#include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/Software/RasterFont.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWRenderer.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoCommon/ImageWrite.h" +#include "VideoCommon/OnScreenDisplay.h" static GLuint s_RenderTarget = 0; diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index 83330d772a..20ba425e22 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -4,9 +4,9 @@ #pragma once -#include "CommonTypes.h" -#include "EfbInterface.h" -#include "Thread.h" +#include "Common/CommonTypes.h" +#include "Common/Thread.h" +#include "VideoBackends/Software/EfbInterface.h" namespace SWRenderer { diff --git a/Source/Core/VideoBackends/Software/SWStatistics.cpp b/Source/Core/VideoBackends/Software/SWStatistics.cpp index c033e2f684..e1d3ec8c0b 100644 --- a/Source/Core/VideoBackends/Software/SWStatistics.cpp +++ b/Source/Core/VideoBackends/Software/SWStatistics.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SWStatistics.h" +#include "VideoBackends/Software/SWStatistics.h" SWStatistics swstats; diff --git a/Source/Core/VideoBackends/Software/SWStatistics.h b/Source/Core/VideoBackends/Software/SWStatistics.h index b77953f06f..61f41c7e88 100644 --- a/Source/Core/VideoBackends/Software/SWStatistics.h +++ b/Source/Core/VideoBackends/Software/SWStatistics.h @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonTypes.h" -#include "SWVideoConfig.h" +#include "Common/CommonTypes.h" +#include "VideoBackends/Software/SWVideoConfig.h" #pragma once diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index a8cbdae326..fbecdaeb79 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -2,22 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" -#include "SWVertexLoader.h" -#include "VertexLoader_Position.h" -#include "VertexLoader_Normal.h" -#include "VertexLoader_Color.h" -#include "VertexLoader_TextCoord.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/SetupUnit.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVertexLoader.h" +#include "VideoBackends/Software/TransformUnit.h" +#include "VideoBackends/Software/XFMemLoader.h" -#include "CPMemLoader.h" -#include "XFMemLoader.h" - -#include "TransformUnit.h" -#include "SetupUnit.h" -#include "SWStatistics.h" -#include "VertexManagerBase.h" -#include "DataReader.h" +#include "VideoCommon/DataReader.h" +#include "VideoCommon/VertexLoader_Color.h" +#include "VideoCommon/VertexLoader_Normal.h" +#include "VideoCommon/VertexLoader_Position.h" +#include "VideoCommon/VertexLoader_TextCoord.h" +#include "VideoCommon/VertexManagerBase.h" // Vertex loaders read these extern int tcIndex; diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h index 0b6a023bff..ed6bf0bb36 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.h +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h @@ -4,11 +4,11 @@ #pragma once -#include "Common.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" -#include "NativeVertexFormat.h" -#include "CPMemLoader.h" -#include "ChunkFile.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/NativeVertexFormat.h" class SetupUnit; diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 36f91265cb..091eab35fa 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "IniFile.h" -#include "SWVideoConfig.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "VideoBackends/Software/SWVideoConfig.h" SWVideoConfig g_SWVideoConfig; diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h index 0de5b93998..758f9bb722 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.h +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" #define STATISTICS 1 diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 132b40fa81..b4a4cb2a2a 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -2,39 +2,39 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/Atomic.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" -#include "Common.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/VideoInterface.h" + +#include "VideoBackends/OGL/GLExtensions/GLExtensions.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/Clipper.h" +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/HwRasterizer.h" +#include "VideoBackends/Software/OpcodeDecoder.h" +#include "VideoBackends/Software/Rasterizer.h" +#include "VideoBackends/Software/SWCommandProcessor.h" +#include "VideoBackends/Software/SWPixelEngine.h" +#include "VideoBackends/Software/SWRenderer.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVertexLoader.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/VideoBackend.h" +#include "VideoBackends/Software/XFMemLoader.h" #if defined(HAVE_WX) && HAVE_WX -#include "VideoConfigDialog.h" +#include "VideoBackends/Software/VideoConfigDialog.h" #endif // HAVE_WX -#include "../OGL/GLExtensions/GLExtensions.h" -#include "Atomic.h" -#include "SWCommandProcessor.h" -#include "OpcodeDecoder.h" -#include "SWVideoConfig.h" -#include "SWPixelEngine.h" -#include "BPMemLoader.h" -#include "XFMemLoader.h" -#include "Clipper.h" -#include "Rasterizer.h" -#include "SWRenderer.h" -#include "HwRasterizer.h" -#include "LogManager.h" -#include "EfbInterface.h" -#include "DebugUtil.h" -#include "FileUtil.h" -#include "VideoBackend.h" -#include "Core.h" -#include "OpcodeDecoder.h" -#include "SWVertexLoader.h" -#include "SWStatistics.h" -#include "HW/VideoInterface.h" -#include "HW/Memmap.h" -#include "ConfigManager.h" +#include "VideoCommon/OnScreenDisplay.h" -#include "OnScreenDisplay.h" #define VSYNC_ENABLED 0 static volatile u32 s_swapRequested = false; diff --git a/Source/Core/VideoBackends/Software/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp index b08584e0a9..c324dcf767 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.cpp +++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SetupUnit.h" - -#include "CPMemLoader.h" -#include "OpcodeDecoder.h" -#include "SWStatistics.h" -#include "Clipper.h" +#include "VideoBackends/Software/Clipper.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/OpcodeDecoder.h" +#include "VideoBackends/Software/SetupUnit.h" +#include "VideoBackends/Software/SWStatistics.h" void SetupUnit::Init(u8 primitiveType) diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h index 37e5017581..36163f06bd 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.h +++ b/Source/Core/VideoBackends/Software/SetupUnit.h @@ -4,9 +4,9 @@ #pragma once -#include "Common.h" -#include "NativeVertexFormat.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "VideoBackends/Software/NativeVertexFormat.h" class SetupUnit { diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 254d4cbcff..5ebdcd714c 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" - -#include "Tev.h" -#include "EfbInterface.h" -#include "TextureSampler.h" -#include "XFMemLoader.h" -#include "SWPixelEngine.h" -#include "SWStatistics.h" -#include "SWVideoConfig.h" -#include "DebugUtil.h" - #include +#include "Common/Common.h" + +#include "VideoBackends/Software/DebugUtil.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/SWPixelEngine.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoBackends/Software/Tev.h" +#include "VideoBackends/Software/TextureSampler.h" +#include "VideoBackends/Software/XFMemLoader.h" + #ifdef _DEBUG #define ALLOW_TEV_DUMPS 1 #else diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h index 0642778e0b..617dee842b 100644 --- a/Source/Core/VideoBackends/Software/Tev.h +++ b/Source/Core/VideoBackends/Software/Tev.h @@ -4,8 +4,8 @@ #pragma once -#include "BPMemLoader.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "VideoBackends/Software/BPMemLoader.h" class Tev { diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp index 07bb162cd6..6c24257fe3 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp +++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "TextureEncoder.h" -#include "EfbInterface.h" -#include "BPMemLoader.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/EfbInterface.h" +#include "VideoBackends/Software/TextureEncoder.h" -#include "LookUpTables.h" -#include "TextureDecoder.h" +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/TextureDecoder.h" namespace TextureEncoder diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h index c675f1fca6..84e8004a2e 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.h +++ b/Source/Core/VideoBackends/Software/TextureEncoder.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace TextureEncoder { diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index 0657f701f2..87ac79563b 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -2,14 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "TextureSampler.h" - -#include "BPMemLoader.h" -#include "TextureDecoder.h" -#include "HW/Memmap.h" - #include +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/TextureSampler.h" +#include "VideoCommon/TextureDecoder.h" + #define ALLOW_MIPMAP 1 namespace TextureSampler diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h index 6cd13537bf..d821ace25e 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.h +++ b/Source/Core/VideoBackends/Software/TextureSampler.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" namespace TextureSampler { diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp index e00f05e4aa..f0722ce797 100644 --- a/Source/Core/VideoBackends/Software/TransformUnit.cpp +++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp @@ -2,17 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include -#include - -#include "TransformUnit.h" -#include "XFMemLoader.h" -#include "CPMemLoader.h" -#include "BPMemLoader.h" -#include "NativeVertexFormat.h" - -#include "Vec3.h" +#include "Common/Common.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/NativeVertexFormat.h" +#include "VideoBackends/Software/TransformUnit.h" +#include "VideoBackends/Software/Vec3.h" +#include "VideoBackends/Software/XFMemLoader.h" namespace TransformUnit diff --git a/Source/Core/VideoBackends/Software/Vec3.h b/Source/Core/VideoBackends/Software/Vec3.h index 08f8877e2b..192355cf7d 100644 --- a/Source/Core/VideoBackends/Software/Vec3.h +++ b/Source/Core/VideoBackends/Software/Vec3.h @@ -4,9 +4,10 @@ #pragma once -#include -#include -#include "ChunkFile.h" +#include +#include + +#include "Common/ChunkFile.h" class Vec3 { diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index 89fbc4dd1d..1559427599 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -1,6 +1,6 @@ #pragma once -#include "VideoBackendBase.h" +#include "VideoCommon/VideoBackendBase.h" namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp b/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp index 8d0d999bf7..d730efd6fe 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoConfigDiag.h" -#include "VideoConfigDialog.h" -#include "FileUtil.h" -#include "Core.h" +#include "Common/FileUtil.h" +#include "Core/Core.h" +#include "DolphinWX/VideoConfigDiag.h" +#include "VideoBackends/Software/VideoConfigDialog.h" template IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) : diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/VideoConfigDialog.h index e0884dd79f..59d76a912b 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h @@ -4,22 +4,21 @@ #pragma once -#include #include - -#include "SWVideoConfig.h" -#include "VideoBackendBase.h" -#include "ConfigManager.h" - -#include -#include +#include #include -#include -#include #include +#include #include #include #include +#include +#include +#include + +#include "Core/ConfigManager.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoCommon/VideoBackendBase.h" class VideoConfigDialog : public wxDialog { diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/XFMemLoader.cpp index 899a5fab48..07d5393223 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/XFMemLoader.cpp @@ -2,12 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoCommon.h" - -#include "XFMemLoader.h" -#include "CPMemLoader.h" -#include "Clipper.h" -#include "HW/Memmap.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/Clipper.h" +#include "VideoBackends/Software/CPMemLoader.h" +#include "VideoBackends/Software/XFMemLoader.h" +#include "VideoCommon/VideoCommon.h" XFRegisters swxfregs; diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.h b/Source/Core/VideoBackends/Software/XFMemLoader.h index d790c98cd6..4a827cd7a7 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.h +++ b/Source/Core/VideoBackends/Software/XFMemLoader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" ///////////// // Lighting diff --git a/Source/Core/VideoBackends/Software/stdafx.cpp b/Source/Core/VideoBackends/Software/stdafx.cpp index b602b39925..dff656a86a 100644 --- a/Source/Core/VideoBackends/Software/stdafx.cpp +++ b/Source/Core/VideoBackends/Software/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "VideoBackends/Software/stdafx.h" diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index d6f2755e33..e2c2417837 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -6,9 +6,9 @@ #define __STDC_CONSTANT_MACROS 1 #endif -#include "AVIDump.h" -#include "HW/VideoInterface.h" //for TargetRefreshRate -#include "VideoConfig.h" +#include "Core/HW/VideoInterface.h" //for TargetRefreshRate +#include "VideoCommon/AVIDump.h" +#include "VideoCommon/VideoConfig.h" #ifdef _WIN32 @@ -19,9 +19,9 @@ #include #include -#include "FileUtil.h" -#include "CommonPaths.h" -#include "Log.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/Log.h" HWND m_emuWnd; LONG m_byteBuffer; @@ -204,9 +204,9 @@ bool AVIDump::SetVideoFormat() #else -#include "FileUtil.h" -#include "StringUtil.h" -#include "Log.h" +#include "Common/FileUtil.h" +#include "Common/Log.h" +#include "Common/StringUtil.h" extern "C" { #include diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h index b12f316ab3..c9aa2a4778 100644 --- a/Source/Core/VideoCommon/AVIDump.h +++ b/Source/Core/VideoCommon/AVIDump.h @@ -10,7 +10,7 @@ #include #endif -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class AVIDump { diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index 3cc1764f3b..a3bcd3af30 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -2,15 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "BPFunctions.h" -#include "Common.h" -#include "RenderBase.h" -#include "TextureCacheBase.h" -#include "VertexManagerBase.h" -#include "VertexShaderManager.h" -#include "VideoConfig.h" -#include "HW/Memmap.h" -#include "ConfigManager.h" +#include "Common/Common.h" + +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" + +#include "VideoCommon/BPFunctions.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" const bool renderFog = false; namespace BPFunctions diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h index b750e81b48..dfaaa39600 100644 --- a/Source/Core/VideoCommon/BPFunctions.h +++ b/Source/Core/VideoCommon/BPFunctions.h @@ -9,8 +9,8 @@ #pragma once -#include "BPMemory.h" -#include "VideoCommon.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/VideoCommon.h" namespace BPFunctions { diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp index 7272ed0993..7902bf70a6 100644 --- a/Source/Core/VideoCommon/BPMemory.cpp +++ b/Source/Core/VideoCommon/BPMemory.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "BPMemory.h" +#include "Common/Common.h" +#include "VideoCommon/BPMemory.h" // BP state // STATE_TO_SAVE diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index 749ae4d1c2..35f1e79d9b 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" #pragma pack(4) diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 2434d347fa..c417e0d26b 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -4,20 +4,21 @@ #include -#include "VideoConfig.h" -#include "Statistics.h" -#include "RenderBase.h" -#include "VideoCommon.h" -#include "PixelShaderManager.h" -#include "PixelEngine.h" -#include "BPFunctions.h" -#include "BPStructs.h" -#include "TextureDecoder.h" -#include "VertexLoader.h" -#include "VertexShaderManager.h" -#include "Thread.h" -#include "HW/Memmap.h" -#include "PerfQueryBase.h" +#include "Common/Thread.h" +#include "Core/HW/Memmap.h" + +#include "VideoCommon/BPFunctions.h" +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/PerfQueryBase.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" using namespace BPFunctions; diff --git a/Source/Core/VideoCommon/BPStructs.h b/Source/Core/VideoCommon/BPStructs.h index cf67ba2a6e..2a99443346 100644 --- a/Source/Core/VideoCommon/BPStructs.h +++ b/Source/Core/VideoCommon/BPStructs.h @@ -4,7 +4,7 @@ #pragma once -#include "BPMemory.h" +#include "VideoCommon/BPMemory.h" void BPInit(); void LoadBPReg(u32 value0); diff --git a/Source/Core/VideoCommon/CPMemory.cpp b/Source/Core/VideoCommon/CPMemory.cpp index fd8874d156..f86e206f6f 100644 --- a/Source/Core/VideoCommon/CPMemory.cpp +++ b/Source/Core/VideoCommon/CPMemory.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "CPMemory.h" +#include "Common/Common.h" +#include "VideoCommon/CPMemory.h" // CP state u8 *cached_arraybases[16]; diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h index 7a5af3cc19..4146caa590 100644 --- a/Source/Core/VideoCommon/CPMemory.h +++ b/Source/Core/VideoCommon/CPMemory.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // Vertex array numbers enum diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 3383d7f79a..0ccd251718 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -2,24 +2,24 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "VideoConfig.h" -#include "MathUtil.h" -#include "Thread.h" -#include "Atomic.h" -#include "Fifo.h" -#include "ChunkFile.h" -#include "CommandProcessor.h" -#include "PixelEngine.h" -#include "CoreTiming.h" -#include "ConfigManager.h" -#include "HW/ProcessorInterface.h" -#include "HW/GPFifo.h" -#include "HW/Memmap.h" -#include "HW/SystemTimers.h" -#include "Core.h" -#include "HW/MMIO.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "Common/Thread.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SystemTimers.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" namespace CommandProcessor { diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h index f57402f0ec..09a5f454ca 100644 --- a/Source/Core/VideoCommon/CommandProcessor.h +++ b/Source/Core/VideoCommon/CommandProcessor.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "VideoBackendBase.h" +#include "Common/Common.h" +#include "VideoCommon/VideoBackendBase.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h index 2066334f75..dd963b1f58 100644 --- a/Source/Core/VideoCommon/DataReader.h +++ b/Source/Core/VideoCommon/DataReader.h @@ -4,7 +4,7 @@ #pragma once -#include "VertexManagerBase.h" +#include "VideoCommon/VertexManagerBase.h" extern u8* g_pVideoData; diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp index e936060688..affeb9183a 100644 --- a/Source/Core/VideoCommon/Debugger.cpp +++ b/Source/Core/VideoCommon/Debugger.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "IniFile.h" -#include "Debugger.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" -#include "VideoConfig.h" -#include "TextureCacheBase.h" -#include "PixelShaderGen.h" -#include "VertexShaderGen.h" -#include "NativeVertexFormat.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VideoConfig.h" //void UpdateFPSDisplay(const char *text); extern NativeVertexFormat *g_nativeVertexFmt; diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index b15c5cfbd4..1a0475f0a6 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -4,8 +4,8 @@ #include -#include "LogManager.h" -#include "DriverDetails.h" +#include "Common/LogManager.h" +#include "VideoCommon/DriverDetails.h" namespace DriverDetails { diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h index b9707b3062..c9bcb66130 100644 --- a/Source/Core/VideoCommon/DriverDetails.h +++ b/Source/Core/VideoCommon/DriverDetails.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" namespace DriverDetails { diff --git a/Source/Core/VideoCommon/EmuWindow.cpp b/Source/Core/VideoCommon/EmuWindow.cpp index 23a7208605..b5570a9a0f 100644 --- a/Source/Core/VideoCommon/EmuWindow.cpp +++ b/Source/Core/VideoCommon/EmuWindow.cpp @@ -4,13 +4,14 @@ #include -#include "VideoConfig.h" -#include "EmuWindow.h" -#include "Fifo.h" -#include "VideoBackendBase.h" -#include "Core.h" -#include "Host.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" + +#include "VideoCommon/EmuWindow.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/VideoBackendBase.h" +#include "VideoCommon/VideoConfig.h" namespace EmuWindow { diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index d9464afedc..cdf7c1d85f 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FPSCounter.h" -#include "FileUtil.h" -#include "Timer.h" -#include "VideoConfig.h" +#include "Common/FileUtil.h" +#include "Common/Timer.h" + +#include "VideoCommon/FPSCounter.h" +#include "VideoCommon/VideoConfig.h" #define FPS_REFRESH_INTERVAL 1000 diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index 92b9753623..178a8c6db6 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -2,18 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoConfig.h" -#include "MemoryUtil.h" -#include "Thread.h" -#include "Atomic.h" -#include "OpcodeDecoding.h" -#include "CommandProcessor.h" -#include "PixelEngine.h" -#include "ChunkFile.h" -#include "Fifo.h" -#include "HW/Memmap.h" -#include "Core.h" -#include "CoreTiming.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/MemoryUtil.h" +#include "Common/Thread.h" + +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" + +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/VideoConfig.h" volatile bool g_bSkipCurrentFrame = false; extern u8* g_pVideoData; diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h index 83127f5a75..9045c562c4 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "VideoBackendBase.h" +#include "Common/Common.h" +#include "VideoCommon/VideoBackendBase.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index a975da624c..e5e8a856ca 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -1,8 +1,7 @@ -#include "FramebufferManagerBase.h" - -#include "RenderBase.h" -#include "VideoConfig.h" +#include "VideoCommon/FramebufferManagerBase.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoConfig.h" FramebufferManagerBase *g_framebuffer_manager; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index be668caa03..6f0b73f570 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -2,7 +2,7 @@ #include -#include "VideoCommon.h" +#include "VideoCommon/VideoCommon.h" inline bool addrRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper) { diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index c88e4ae5d5..286e3e28d5 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "HiresTextures.h" - +#include #include #include -#include #include -#include "CommonPaths.h" -#include "FileUtil.h" -#include "FileSearch.h" -#include "StringUtil.h" + +#include "Common/CommonPaths.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" + +#include "VideoCommon/HiresTextures.h" namespace HiresTextures { diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index 18267e4869..c51d0b8b6d 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -5,8 +5,8 @@ #pragma once #include -#include "VideoCommon.h" -#include "TextureDecoder.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoCommon.h" namespace HiresTextures { diff --git a/Source/Core/VideoCommon/ImageWrite.cpp b/Source/Core/VideoCommon/ImageWrite.cpp index 193f058541..ad0449dd2f 100644 --- a/Source/Core/VideoCommon/ImageWrite.cpp +++ b/Source/Core/VideoCommon/ImageWrite.cpp @@ -6,8 +6,8 @@ #include #include "png.h" -#include "ImageWrite.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "VideoCommon/ImageWrite.h" bool SaveData(const char* filename, const char* data) { diff --git a/Source/Core/VideoCommon/ImageWrite.h b/Source/Core/VideoCommon/ImageWrite.h index 7022526ad8..5df630651a 100644 --- a/Source/Core/VideoCommon/ImageWrite.h +++ b/Source/Core/VideoCommon/ImageWrite.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" bool SaveData(const char* filename, const char* pdata); bool TextureToPng(u8* data, int row_stride, const std::string filename, int width, int height, bool saveAlpha = true); diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp index 0789ec1e1a..809a2be2e2 100644 --- a/Source/Core/VideoCommon/IndexGenerator.cpp +++ b/Source/Core/VideoCommon/IndexGenerator.cpp @@ -4,9 +4,9 @@ #include -#include "Common.h" -#include "VideoConfig.h" -#include "IndexGenerator.h" +#include "Common/Common.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/VideoConfig.h" //Init u16 *IndexGenerator::index_buffer_current; diff --git a/Source/Core/VideoCommon/IndexGenerator.h b/Source/Core/VideoCommon/IndexGenerator.h index 18f2b66d11..e5d09c8d96 100644 --- a/Source/Core/VideoCommon/IndexGenerator.h +++ b/Source/Core/VideoCommon/IndexGenerator.h @@ -7,7 +7,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class IndexGenerator { diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h index f74f92ad5c..9379f65775 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.h +++ b/Source/Core/VideoCommon/LightingShaderGen.h @@ -4,9 +4,9 @@ #pragma once -#include "ShaderGenCommon.h" -#include "NativeVertexFormat.h" -#include "XFMemory.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/ShaderGenCommon.h" +#include "VideoCommon/XFMemory.h" #define LIGHT_COL "%s[5*%d].%s" diff --git a/Source/Core/VideoCommon/LookUpTables.h b/Source/Core/VideoCommon/LookUpTables.h index 57414d21cd..eb38557eb3 100644 --- a/Source/Core/VideoCommon/LookUpTables.h +++ b/Source/Core/VideoCommon/LookUpTables.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" inline u8 Convert3To8(u8 v) { diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp index 43c0d7a140..8694fe2d1a 100644 --- a/Source/Core/VideoCommon/MainBase.cpp +++ b/Source/Core/VideoCommon/MainBase.cpp @@ -1,19 +1,20 @@ -#include "MainBase.h" -#include "VideoState.h" -#include "VideoConfig.h" -#include "RenderBase.h" -#include "FramebufferManagerBase.h" -#include "TextureCacheBase.h" -#include "VertexLoaderManager.h" -#include "CommandProcessor.h" -#include "PixelEngine.h" -#include "Atomic.h" -#include "Fifo.h" -#include "BPStructs.h" -#include "OnScreenDisplay.h" -#include "VideoBackendBase.h" -#include "ConfigManager.h" +#include "Common/Atomic.h" +#include "Core/ConfigManager.h" + +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/FramebufferManagerBase.h" +#include "VideoCommon/MainBase.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VideoBackendBase.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoState.h" bool s_BackendInitialized = false; diff --git a/Source/Core/VideoCommon/MainBase.h b/Source/Core/VideoCommon/MainBase.h index a3a5ed0add..3b4d574439 100644 --- a/Source/Core/VideoCommon/MainBase.h +++ b/Source/Core/VideoCommon/MainBase.h @@ -1,6 +1,6 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" extern bool s_BackendInitialized; extern u32 s_efbAccessRequested; diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index c57e34baa9..8dd53c77a6 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // m_components enum diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 9f14a90526..7ea6d55daa 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -3,17 +3,18 @@ // Refer to the license.txt file included. #include - -#include "Common.h" - -#include "ConfigManager.h" -#include "OnScreenDisplay.h" -#include "RenderBase.h" -#include "Timer.h" - #include #include +#include "Common/Common.h" +#include "Common/Timer.h" + +#include "Core/ConfigManager.h" + +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/RenderBase.h" + + namespace OSD { diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index cb47639b81..8c680a04c5 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -12,28 +12,24 @@ // while interpreting them, and hope that the vertex format doesn't change, though, if you do it right // when they are called. The reason is that the vertex format affects the sizes of the vertices. -#include "Common.h" -#include "VideoCommon.h" -#include "OpcodeDecoding.h" -#include "CommandProcessor.h" -#include "CPUDetect.h" -#include "Core.h" -#include "Host.h" -#include "HW/Memmap.h" -#include "FifoPlayer/FifoRecorder.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/FifoPlayer/FifoRecorder.h" +#include "Core/HW/Memmap.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/DataReader.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" -#include "VertexLoaderManager.h" - -#include "Statistics.h" - -#include "XFMemory.h" -#include "CPMemory.h" -#include "BPMemory.h" - -#include "Fifo.h" -#include "DataReader.h" - -#include "VideoConfig.h" u8* g_pVideoData = 0; bool g_bRecordFifoData = false; diff --git a/Source/Core/VideoCommon/PerfQueryBase.cpp b/Source/Core/VideoCommon/PerfQueryBase.cpp index ada539c05e..cf59b3101c 100644 --- a/Source/Core/VideoCommon/PerfQueryBase.cpp +++ b/Source/Core/VideoCommon/PerfQueryBase.cpp @@ -1,5 +1,5 @@ -#include "PerfQueryBase.h" -#include "VideoConfig.h" +#include "VideoCommon/PerfQueryBase.h" +#include "VideoCommon/VideoConfig.h" PerfQueryBase* g_perf_query = 0; diff --git a/Source/Core/VideoCommon/PerfQueryBase.h b/Source/Core/VideoCommon/PerfQueryBase.h index ad112ede9d..7b68b84d75 100644 --- a/Source/Core/VideoCommon/PerfQueryBase.h +++ b/Source/Core/VideoCommon/PerfQueryBase.h @@ -1,6 +1,6 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" enum PerfQueryType { diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index de46dce77a..4d913dd836 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -6,19 +6,18 @@ // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!! -#include "Common.h" -#include "VideoCommon.h" -#include "ChunkFile.h" -#include "Atomic.h" -#include "CoreTiming.h" -#include "ConfigManager.h" - -#include "PixelEngine.h" -#include "RenderBase.h" -#include "CommandProcessor.h" -#include "HW/MMIO.h" -#include "HW/ProcessorInterface.h" -#include "State.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" +#include "Core/State.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoCommon.h" namespace PixelEngine { diff --git a/Source/Core/VideoCommon/PixelEngine.h b/Source/Core/VideoCommon/PixelEngine.h index 9bbf42eec8..d021859cd6 100644 --- a/Source/Core/VideoCommon/PixelEngine.h +++ b/Source/Core/VideoCommon/PixelEngine.h @@ -4,7 +4,7 @@ #pragma once -#include "CommonTypes.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index fe6db69520..66965139b8 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -2,20 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include #include -#include +#include #include #ifdef __APPLE__ #include #endif -#include "LightingShaderGen.h" -#include "PixelShaderGen.h" -#include "XFMemory.h" // for texture projection mode -#include "BPMemory.h" -#include "VideoConfig.h" -#include "NativeVertexFormat.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/LightingShaderGen.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" // for texture projection mode // old tev->pixelshader notes diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h index 8a30e35539..6ed6960420 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.h +++ b/Source/Core/VideoCommon/PixelShaderGen.h @@ -4,10 +4,10 @@ #pragma once -#include "VideoCommon.h" -#include "ShaderGenCommon.h" -#include "BPMemory.h" -#include "LightingShaderGen.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/LightingShaderGen.h" +#include "VideoCommon/ShaderGenCommon.h" +#include "VideoCommon/VideoCommon.h" #define I_COLORS "color" #define I_KCOLORS "k" diff --git a/Source/Core/VideoCommon/PixelShaderManager.cpp b/Source/Core/VideoCommon/PixelShaderManager.cpp index 0c35bb44e4..74cc5c1be3 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/PixelShaderManager.cpp @@ -4,13 +4,14 @@ #include -#include "Common.h" -#include "Statistics.h" -#include "PixelShaderManager.h" -#include "VideoCommon.h" -#include "VideoConfig.h" +#include "Common/Common.h" + +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" -#include "RenderBase.h" static bool s_bFogRangeAdjustChanged; static bool s_bViewPortChanged; static int nLightsChanged[2]; // min,max diff --git a/Source/Core/VideoCommon/PixelShaderManager.h b/Source/Core/VideoCommon/PixelShaderManager.h index c5be1120be..bd0c904b43 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.h +++ b/Source/Core/VideoCommon/PixelShaderManager.h @@ -4,10 +4,10 @@ #pragma once -#include "BPMemory.h" -#include "XFMemory.h" -#include "PixelShaderGen.h" -#include "ConstantManager.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/ConstantManager.h" +#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/XFMemory.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 28e7893b09..e275238ab0 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -12,31 +12,32 @@ // Next frame, that one is scanned out and the other one gets the copy. = double buffering. // --------------------------------------------------------------------------------------------- - -#include "RenderBase.h" -#include "Atomic.h" -#include "BPMemory.h" -#include "CommandProcessor.h" -#include "CPMemory.h" -#include "MainBase.h" -#include "VideoConfig.h" -#include "FramebufferManagerBase.h" -#include "TextureCacheBase.h" -#include "Fifo.h" -#include "OpcodeDecoding.h" -#include "Timer.h" -#include "StringUtil.h" -#include "Host.h" -#include "XFMemory.h" -#include "FifoPlayer/FifoRecorder.h" -#include "AVIDump.h" -#include "Debugger.h" -#include "Statistics.h" -#include "Core.h" - #include #include +#include "Common/Atomic.h" +#include "Common/StringUtil.h" +#include "Common/Timer.h" + +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/FifoPlayer/FifoRecorder.h" + +#include "VideoCommon/AVIDump.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/FramebufferManagerBase.h" +#include "VideoCommon/MainBase.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" + // TODO: Move these out of here. int frameCount; int OSDChoice, OSDTime; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index fb99362a2a..96bf4312d7 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -14,15 +14,15 @@ #pragma once -#include "VideoCommon.h" -#include "Thread.h" -#include "MathUtil.h" -#include "NativeVertexFormat.h" -#include "FramebufferManagerBase.h" -#include "BPMemory.h" - #include +#include "Common/MathUtil.h" +#include "Common/Thread.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/FramebufferManagerBase.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/VideoCommon.h" + // TODO: Move these out of here. extern int frameCount; extern int OSDChoice; diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index 93f4f14ef3..64d30a0dbc 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -4,14 +4,14 @@ #pragma once -#include -#include +#include +#include +#include #include #include -#include -#include "CommonTypes.h" -#include "VideoCommon.h" +#include "Common/CommonTypes.h" +#include "VideoCommon/VideoCommon.h" /** * Common interface for classes that need to go through the shader generation path (GenerateVertexShader, GeneratePixelShader) diff --git a/Source/Core/VideoCommon/Statistics.cpp b/Source/Core/VideoCommon/Statistics.cpp index 81219201bc..d1d6312e41 100644 --- a/Source/Core/VideoCommon/Statistics.cpp +++ b/Source/Core/VideoCommon/Statistics.cpp @@ -5,8 +5,8 @@ #include #include -#include "Statistics.h" -#include "VertexLoaderManager.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoaderManager.h" Statistics stats; diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h index daa8700d7f..989549e6ce 100644 --- a/Source/Core/VideoCommon/Statistics.h +++ b/Source/Core/VideoCommon/Statistics.h @@ -2,10 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonTypes.h" -#include "VideoCommon.h" #include +#include "Common/CommonTypes.h" +#include "VideoCommon/VideoCommon.h" + #pragma once struct Statistics diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 6748228b2f..5abce6fdee 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "MemoryUtil.h" +#include "Common/FileUtil.h" +#include "Common/MemoryUtil.h" -#include "VideoConfig.h" -#include "Statistics.h" -#include "HiresTextures.h" -#include "RenderBase.h" -#include "FileUtil.h" +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" -#include "TextureCacheBase.h" -#include "Debugger.h" -#include "ConfigManager.h" -#include "HW/Memmap.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/HiresTextures.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VideoConfig.h" // ugly extern int frameCount; diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 81fcd88ee6..517f45433d 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -6,12 +6,12 @@ #include -#include "VideoCommon.h" -#include "TextureDecoder.h" -#include "BPMemory.h" -#include "Thread.h" +#include "Common/CommonTypes.h" +#include "Common/Thread.h" -#include "CommonTypes.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoCommon.h" struct VideoConfig; diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp index 209b7e4ab7..a7db33418f 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.cpp +++ b/Source/Core/VideoCommon/TextureConversionShader.cpp @@ -2,19 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#include -#include +#include +#include #include #ifdef __APPLE__ #include #endif -#include "TextureConversionShader.h" -#include "TextureDecoder.h" -#include "BPMemory.h" -#include "RenderBase.h" -#include "VideoConfig.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/TextureConversionShader.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoConfig.h" #define WRITE p+=sprintf diff --git a/Source/Core/VideoCommon/TextureConversionShader.h b/Source/Core/VideoCommon/TextureConversionShader.h index b3c05418c8..6832cc0614 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.h +++ b/Source/Core/VideoCommon/TextureConversionShader.h @@ -4,9 +4,9 @@ #pragma once -#include "Common.h" -#include "TextureDecoder.h" -#include "VideoCommon.h" +#include "Common/Common.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoCommon.h" namespace TextureConversionShader { diff --git a/Source/Core/VideoCommon/TextureDecoder.h b/Source/Core/VideoCommon/TextureDecoder.h index dd1aef199a..284b992f45 100644 --- a/Source/Core/VideoCommon/TextureDecoder.h +++ b/Source/Core/VideoCommon/TextureDecoder.h @@ -4,7 +4,7 @@ #pragma once -#include "Hash.h" +#include "Common/Hash.h" enum { diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index a4f301e36c..91fb723e84 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -15,18 +15,14 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" -//#include "VideoCommon.h" // to get debug logs - -#include "CPUDetect.h" -#include "TextureDecoder.h" -#include "VideoConfig.h" - -#include "LookUpTables.h" - #include - +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/TextureDecoder.h" +//#include "VideoCommon/VideoCommon.h" // to get debug logs +#include "VideoCommon/VideoConfig.h" bool TexFmt_Overlay_Enable=false; bool TexFmt_Overlay_Center=false; diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 3f7c7554c8..d00a9bb454 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -2,17 +2,16 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -//#include "VideoCommon.h" // to get debug logs - -#include "CPUDetect.h" -#include "TextureDecoder.h" -#include "VideoConfig.h" - -#include "LookUpTables.h" - #include +#include "Common/Common.h" +//#include "VideoCommon.h" // to get debug logs +#include "Common/CPUDetect.h" + +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoConfig.h" + #ifdef _OPENMP #include #elif defined __GNUC__ diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 7246d4812a..a9bdb468b8 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -2,32 +2,32 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "VideoConfig.h" -#include "MemoryUtil.h" -#include "StringUtil.h" -#include "x64Emitter.h" -#include "x64ABI.h" -#include "PixelEngine.h" -#include "Host.h" +#include "Common/Common.h" +#include "Common/MemoryUtil.h" +#include "Common/StringUtil.h" +#include "Common/x64ABI.h" +#include "Common/x64Emitter.h" -#include "LookUpTables.h" -#include "Statistics.h" -#include "VertexLoaderManager.h" -#include "VertexLoader.h" -#include "BPMemory.h" -#include "DataReader.h" -#include "VertexManagerBase.h" -#include "IndexGenerator.h" +#include "Core/Host.h" -#include "VertexLoader_Position.h" -#include "VertexLoader_Normal.h" -#include "VertexLoader_Color.h" -#include "VertexLoader_TextCoord.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/DataReader.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_Color.h" +#include "VideoCommon/VertexLoader_Normal.h" +#include "VideoCommon/VertexLoader_Position.h" +#include "VideoCommon/VertexLoader_TextCoord.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" //BBox -#include "XFMemory.h" +#include "VideoCommon/XFMemory.h" #ifndef _M_GENERIC #ifndef __APPLE__ #define USE_JIT diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index eeb9ec766b..6b720b54aa 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -10,13 +10,13 @@ #include #include -#include "Common.h" +#include "Common/Common.h" +#include "Common/x64Emitter.h" -#include "CPMemory.h" -#include "DataReader.h" -#include "NativeVertexFormat.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/DataReader.h" +#include "VideoCommon/NativeVertexFormat.h" -#include "x64Emitter.h" class VertexLoaderUID { diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index fbc48e5fb7..b7ad98e67d 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -6,13 +6,13 @@ #include #include -#include "VideoCommon.h" -#include "Statistics.h" +#include "Core/HW/Memmap.h" -#include "VertexShaderManager.h" -#include "VertexLoader.h" -#include "VertexLoaderManager.h" -#include "HW/Memmap.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoCommon.h" static int s_attr_dirty; // bitfield diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index e7461acdc1..7e6c46818a 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -4,9 +4,10 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" + namespace VertexLoaderManager { void Init(); diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp index 88d7d557a9..03fee03292 100644 --- a/Source/Core/VideoCommon/VertexLoader_Color.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "LookUpTables.h" -#include "VertexLoader.h" -#include "VertexLoader_Color.h" -#include "VertexManagerBase.h" +#include "Common/Common.h" + +#include "VideoCommon/LookUpTables.h" +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_Color.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VideoCommon.h" #define RSHIFT 0 #define GSHIFT 8 diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp index 24d2f0b1ff..5cc366fdce 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp @@ -2,15 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "VertexLoader.h" -#include "VertexLoader_Normal.h" -#include "VertexManagerBase.h" -#include "CPUDetect.h" #include #include +#include "Common/Common.h" +#include "Common/CPUDetect.h" + +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_Normal.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VideoCommon.h" + #if _M_SSE >= 0x401 #include #include diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h index 34f8736237..5cbe6232bb 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.h +++ b/Source/Core/VideoCommon/VertexLoader_Normal.h @@ -4,8 +4,7 @@ #pragma once -#include "Common.h" -#include "CommonTypes.h" +#include "Common/Common.h" class VertexLoader_Normal { diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp index ee26acfbe7..5ca07e7792 100644 --- a/Source/Core/VideoCommon/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp @@ -4,12 +4,13 @@ #include -#include "Common.h" -#include "VideoCommon.h" -#include "VertexLoader.h" -#include "VertexLoader_Position.h" -#include "VertexManagerBase.h" -#include "CPUDetect.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" + +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_Position.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VideoCommon.h" extern float posScale; extern TVtxAttr *pVtxAttr; diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp index dae72e22b8..d8fcf9bbaa 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp +++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "VertexLoader.h" -#include "VertexLoader_TextCoord.h" -#include "VertexManagerBase.h" -#include "CPUDetect.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" + +#include "VideoCommon/VertexLoader.h" +#include "VideoCommon/VertexLoader_TextCoord.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VideoCommon.h" + #if _M_SSE >= 0x401 #include diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h index 8d3f61809b..30550b9626 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.h +++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h @@ -4,7 +4,7 @@ #pragma once -#include "NativeVertexFormat.h" +#include "VideoCommon/NativeVertexFormat.h" class VertexLoader_TextCoord { diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 0ea44d9a57..62134854ec 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -1,22 +1,20 @@ +#include "Common/Common.h" -#include "Common.h" - -#include "Statistics.h" -#include "OpcodeDecoding.h" -#include "IndexGenerator.h" -#include "VertexShaderManager.h" -#include "PixelShaderManager.h" -#include "NativeVertexFormat.h" -#include "TextureCacheBase.h" -#include "RenderBase.h" -#include "BPStructs.h" -#include "XFMemory.h" -#include "Debugger.h" -#include "PerfQueryBase.h" - -#include "VertexManagerBase.h" -#include "MainBase.h" -#include "VideoConfig.h" +#include "VideoCommon/BPStructs.h" +#include "VideoCommon/Debugger.h" +#include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/MainBase.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/PerfQueryBase.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/TextureCacheBase.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" VertexManager *g_vertex_manager; diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index 997cf308d1..e98db7b3ee 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -1,7 +1,7 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" class NativeVertexFormat; class PointerWrap; diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp index 5d1855d8d9..67cb4c1231 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/VertexShaderGen.cpp @@ -2,20 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include #include #ifdef __APPLE__ #include #endif -#include "NativeVertexFormat.h" - -#include "BPMemory.h" -#include "CPMemory.h" -#include "DriverDetails.h" -#include "LightingShaderGen.h" -#include "VertexShaderGen.h" -#include "VideoConfig.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/DriverDetails.h" +#include "VideoCommon/LightingShaderGen.h" +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VideoConfig.h" static char text[16768]; diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h index 65d605ce68..e705845a6a 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.h +++ b/Source/Core/VideoCommon/VertexShaderGen.h @@ -4,10 +4,10 @@ #pragma once -#include "XFMemory.h" -#include "VideoCommon.h" -#include "ShaderGenCommon.h" -#include "LightingShaderGen.h" +#include "VideoCommon/LightingShaderGen.h" +#include "VideoCommon/ShaderGenCommon.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/XFMemory.h" // TODO should be reordered #define SHADER_POSITION_ATTRIB 0 diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index c1f5b8188e..a9a9f4de8d 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -2,25 +2,22 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoConfig.h" -#include "MathUtil.h" - #include #include -#include "Statistics.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" -#include "VertexShaderGen.h" -#include "VertexShaderManager.h" -#include "BPMemory.h" -#include "CPMemory.h" -#include "XFMemory.h" -#include "VideoCommon.h" -#include "VertexManagerBase.h" -#include "RenderBase.h" - -#include "RenderBase.h" float GC_ALIGNED16(g_fProjectionMatrix[16]); // track changes diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h index 08b6e8119c..d99f07fe21 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.h +++ b/Source/Core/VideoCommon/VertexShaderManager.h @@ -4,8 +4,8 @@ #pragma once -#include "VertexShaderGen.h" -#include "ConstantManager.h" +#include "VideoCommon/ConstantManager.h" +#include "VideoCommon/VertexShaderGen.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 7e9fbfd033..36e52b6654 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoBackendBase.h" - // TODO: ugly #ifdef _WIN32 -#include "../VideoBackends/D3D/VideoBackend.h" +#include "VideoBackends/D3D/VideoBackend.h" #endif -#include "../VideoBackends/OGL/VideoBackend.h" -#include "../VideoBackends/Software/VideoBackend.h" +#include "VideoBackends/OGL/VideoBackend.h" +#include "VideoBackends/Software/VideoBackend.h" + +#include "VideoCommon/VideoBackendBase.h" std::vector g_available_video_backends; VideoBackend* g_video_backend = NULL; diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 62423b33b4..66ea7857a8 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -7,8 +7,8 @@ #include #include -#include "ChunkFile.h" -#include "../VideoCommon/PerfQueryBase.h" +#include "Common/ChunkFile.h" +#include "VideoCommon/PerfQueryBase.h" namespace MMIO { class Mapping; } diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index d71390c999..b18afce482 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -9,9 +9,9 @@ #include #endif -#include "Common.h" -#include "MathUtil.h" -#include "VideoBackendBase.h" +#include "Common/Common.h" +#include "Common/MathUtil.h" +#include "VideoCommon/VideoBackendBase.h" #if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64) void * memcpy_amd(void *dest, const void *src, size_t n); diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 37c68786dd..c6e37b96fc 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -4,15 +4,15 @@ #include -#include "Common.h" -#include "IniFile.h" -#include "VideoConfig.h" -#include "VideoCommon.h" -#include "FileUtil.h" -#include "Core.h" -#include "Movie.h" -#include "OnScreenDisplay.h" -#include "ConfigManager.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 6afb84f697..4c30305440 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -11,11 +11,11 @@ #pragma once -#include "Common.h" -#include "VideoCommon.h" - -#include #include +#include + +#include "Common/Common.h" +#include "VideoCommon/VideoCommon.h" // Log in two categories, and save three other options in the same byte #define CONF_LOG 1 diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index 9bfbeeaf52..b73088ad22 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/Source/Core/VideoCommon/VideoState.cpp @@ -2,18 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoState.h" - -#include "BPMemory.h" -#include "CPMemory.h" -#include "XFMemory.h" -#include "TextureDecoder.h" -#include "Fifo.h" -#include "CommandProcessor.h" -#include "PixelEngine.h" -#include "PixelShaderManager.h" -#include "VertexShaderManager.h" -#include "VertexManagerBase.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/PixelEngine.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoState.h" +#include "VideoCommon/XFMemory.h" static void DoState(PointerWrap &p) { diff --git a/Source/Core/VideoCommon/VideoState.h b/Source/Core/VideoCommon/VideoState.h index eeb7fb65f1..ba366ca526 100644 --- a/Source/Core/VideoCommon/VideoState.h +++ b/Source/Core/VideoCommon/VideoState.h @@ -4,8 +4,8 @@ #pragma once -#include "Common.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" void VideoCommon_DoState(PointerWrap &p); void VideoCommon_RunLoop(bool enable); diff --git a/Source/Core/VideoCommon/XFMemory.cpp b/Source/Core/VideoCommon/XFMemory.cpp index 139cc35940..ded761179a 100644 --- a/Source/Core/VideoCommon/XFMemory.cpp +++ b/Source/Core/VideoCommon/XFMemory.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "XFMemory.h" +#include "VideoCommon/XFMemory.h" // STATE_TO_SAVE XFRegisters xfregs; diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h index 50934adf30..e5f9ae0576 100644 --- a/Source/Core/VideoCommon/XFMemory.h +++ b/Source/Core/VideoCommon/XFMemory.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" // Lighting diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 2b9e0d45a5..15b7568d6c 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "VideoCommon.h" -#include "XFMemory.h" -#include "CPMemory.h" -#include "VertexManagerBase.h" -#include "VertexShaderManager.h" -#include "PixelShaderManager.h" -#include "HW/Memmap.h" +#include "Common/Common.h" +#include "Core/HW/Memmap.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/XFMemory.h" void XFMemWritten(u32 transferSize, u32 baseAddress) { diff --git a/Source/Core/VideoCommon/XFStructs.h b/Source/Core/VideoCommon/XFStructs.h index 9d72bbfb43..1c09116481 100644 --- a/Source/Core/VideoCommon/XFStructs.h +++ b/Source/Core/VideoCommon/XFStructs.h @@ -4,4 +4,4 @@ #pragma once -#include "XFMemory.h" +#include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoCommon/stdafx.cpp b/Source/Core/VideoCommon/stdafx.cpp index b602b39925..29b70f0fe3 100644 --- a/Source/Core/VideoCommon/stdafx.cpp +++ b/Source/Core/VideoCommon/stdafx.cpp @@ -2,4 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "stdafx.h" +#include "VideoCommon/stdafx.h" diff --git a/Source/DSPTool/DSPTool.cpp b/Source/DSPTool/DSPTool.cpp index 5a776be558..a81e95178c 100644 --- a/Source/DSPTool/DSPTool.cpp +++ b/Source/DSPTool/DSPTool.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" -#include "FileUtil.h" -#include "StringUtil.h" -#include "DSP/DSPCodeUtil.h" -#include "DSP/DSPTables.h" +#include "Common/Common.h" +#include "Common/FileUtil.h" +#include "Common/StringUtil.h" +#include "Core/DSP/DSPCodeUtil.h" +#include "Core/DSP/DSPTables.h" // Stub out the dsplib host stuff, since this is just a simple cmdline tools. u8 DSPHost_ReadHostMemory(u32 addr) { return 0; } diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 11bf856914..36fe12a6ea 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -31,16 +31,7 @@ Order matters! (first hit, first use). Note: Directory containing source file being compiled is always searched first. --> - $(CoreDir)AudioCommon;%(AdditionalIncludeDirectories) - $(CoreDir)Common;%(AdditionalIncludeDirectories) - $(CoreDir)Core;%(AdditionalIncludeDirectories) - $(CoreDir)DiscIO;%(AdditionalIncludeDirectories) - $(CoreDir)DolphinWX;%(AdditionalIncludeDirectories) - $(CoreDir)InputCommon;%(AdditionalIncludeDirectories) - $(CoreDir)VideoBackends\D3D;%(AdditionalIncludeDirectories) - $(CoreDir)VideoBackends\OGL;%(AdditionalIncludeDirectories) - $(CoreDir)VideoBackends\Software;%(AdditionalIncludeDirectories) - $(CoreDir)VideoCommon;%(AdditionalIncludeDirectories) + $(CoreDir);%(AdditionalIncludeDirectories) $(ExternalsDir);%(AdditionalIncludeDirectories) $(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories) $(ExternalsDir)GL;%(AdditionalIncludeDirectories) @@ -119,4 +110,4 @@ - + \ No newline at end of file diff --git a/Source/pch.h b/Source/pch.h index 2851adefca..a8d687d9c6 100644 --- a/Source/pch.h +++ b/Source/pch.h @@ -1,5 +1,3 @@ -#include "Common.h" -#include "Thread.h" #include #include #include @@ -56,3 +54,6 @@ #include #include #include + +#include "Common/Common.h" +#include "Common/Thread.h" diff --git a/Tools/check-includes.py b/Tools/check-includes.py new file mode 100755 index 0000000000..d8d1c33c0d --- /dev/null +++ b/Tools/check-includes.py @@ -0,0 +1,89 @@ +#! /usr/bin/env python + +""" +check-includes.py + +Checks if the includes are sorted properly and following the "system headers +before local headers" rule. + +Ignores what is in #if blocks to avoid false negatives. +""" + +import re +import sys + +def exclude_if_blocks(lines): + '''Removes lines from #if ... #endif blocks.''' + level = 0 + for l in lines: + if l.startswith('#if'): + level += 1 + elif l.startswith('#endif'): + level -= 1 + elif level == 0: + yield l + +def filter_includes(lines): + '''Removes lines that are not #include and keeps only the file part.''' + for l in lines: + if l.startswith('#include'): + if 'NOLINT' not in l: + yield l.split(' ')[1] + +class IncludeFileSorter(object): + def __init__(self, path): + self.path = path + + def __lt__(self, other): + '''Sorting function for include files. + + * System headers go before local headers (check the first character - + if it's different, then the one starting with " is the 'larger'). + * Then, iterate on all the path components: + * If they are equal, try to continue to the next path component. + * If not, return whether the path component are smaller/larger. + * Paths with less components should go first, so after iterating, check + whether one path still has some / in it. + ''' + a, b = self.path, other.path + if a[0] != b[0]: + return False if a[0] == '"' else True + a, b = a[1:-1].lower(), b[1:-1].lower() + while '/' in a and '/' in b: + ca, a = a.split('/', 1) + cb, b = b.split('/', 1) + if ca != cb: + return ca < cb + if '/' in a: + return False + elif '/' in b: + return True + else: + return a < b + + def __eq__(self, other): + return self.path.lower() == other.path.lower() + +def sort_includes(includes): + return sorted(includes, key=IncludeFileSorter) + +def show_differences(bad, good): + bad = [' Current'] + bad + good = [' Should be'] + good + longest = max(len(i) for i in bad) + padded = [i + ' ' * (longest + 4 - len(i)) for i in bad] + return '\n'.join('%s%s' % t for t in zip(padded, good)) + +def check_file(path): + print('Checking %s' % path) + lines = (l.strip() for l in open(path).read().split('\n')) + lines = exclude_if_blocks(lines) + includes = list(filter_includes(lines)) + sorted_includes = sort_includes(includes) + if includes != sorted_includes: + sys.stderr.write('%s: includes are incorrect\n' % path) + sys.stderr.write(show_differences(includes, sorted_includes) + '\n') + +if __name__ == '__main__': + for path in sys.argv[1:]: + check_file(path)