From 2afe2152712981e21d6bda6f029292ed2b1cf91e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Feb 2014 05:18:15 -0500 Subject: [PATCH 01/19] Convert all includes to relative paths. --- Source/Core/AudioCommon/AOSoundStream.cpp | 4 +- Source/Core/AudioCommon/AOSoundStream.h | 4 +- Source/Core/AudioCommon/AlsaSoundStream.cpp | 6 +- Source/Core/AudioCommon/AlsaSoundStream.h | 7 +- Source/Core/AudioCommon/AudioCommon.cpp | 33 +++---- Source/Core/AudioCommon/AudioCommon.h | 4 +- .../Core/AudioCommon/CoreAudioSoundStream.cpp | 2 +- .../Core/AudioCommon/CoreAudioSoundStream.h | 2 +- Source/Core/AudioCommon/DPL2Decoder.cpp | 11 +-- Source/Core/AudioCommon/DSoundStream.cpp | 4 +- Source/Core/AudioCommon/DSoundStream.h | 4 +- Source/Core/AudioCommon/Mixer.cpp | 19 ++-- Source/Core/AudioCommon/Mixer.h | 4 +- Source/Core/AudioCommon/NullSoundStream.cpp | 6 +- Source/Core/AudioCommon/NullSoundStream.h | 4 +- Source/Core/AudioCommon/OpenALStream.cpp | 6 +- Source/Core/AudioCommon/OpenALStream.h | 10 +-- Source/Core/AudioCommon/OpenSLESStream.cpp | 5 +- Source/Core/AudioCommon/OpenSLESStream.h | 4 +- Source/Core/AudioCommon/PulseAudioStream.cpp | 7 +- Source/Core/AudioCommon/PulseAudioStream.h | 7 +- Source/Core/AudioCommon/SoundStream.h | 6 +- Source/Core/AudioCommon/WaveFile.cpp | 6 +- Source/Core/AudioCommon/WaveFile.h | 2 +- Source/Core/AudioCommon/XAudio2Stream.cpp | 4 +- Source/Core/AudioCommon/XAudio2Stream.h | 5 +- Source/Core/AudioCommon/XAudio2_7Stream.cpp | 4 +- Source/Core/AudioCommon/XAudio2_7Stream.h | 4 +- Source/Core/AudioCommon/aldlist.cpp | 4 +- Source/Core/AudioCommon/aldlist.h | 8 +- Source/Core/AudioCommon/stdafx.cpp | 2 +- Source/Core/Common/ArmCPUDetect.cpp | 25 ++---- Source/Core/Common/ArmEmitter.cpp | 27 ++---- Source/Core/Common/ArmEmitter.h | 10 ++- Source/Core/Common/Atomic.h | 4 +- Source/Core/Common/Atomic_GCC.h | 2 +- Source/Core/Common/Atomic_Win32.h | 3 +- Source/Core/Common/BreakPoints.cpp | 10 +-- Source/Core/Common/BreakPoints.h | 4 +- Source/Core/Common/CDUtils.cpp | 10 +-- Source/Core/Common/CDUtils.h | 2 +- Source/Core/Common/ChunkFile.h | 10 +-- Source/Core/Common/ColorUtil.cpp | 4 +- Source/Core/Common/ColorUtil.h | 2 + Source/Core/Common/Common.h | 12 +-- Source/Core/Common/CommonFuncs.h | 2 +- Source/Core/Common/CommonPaths.h | 2 +- Source/Core/Common/Crypto/bn.cpp | 7 +- Source/Core/Common/Crypto/ec.cpp | 10 +-- Source/Core/Common/ExtendedTrace.cpp | 7 +- Source/Core/Common/FPURoundMode.h | 2 +- Source/Core/Common/FifoQueue.h | 2 +- Source/Core/Common/FileSearch.cpp | 13 ++- Source/Core/Common/FileUtil.cpp | 9 +- Source/Core/Common/FileUtil.h | 8 +- Source/Core/Common/Hash.cpp | 4 +- Source/Core/Common/Hash.h | 2 +- Source/Core/Common/IniFile.cpp | 17 ++-- Source/Core/Common/IniFile.h | 4 +- Source/Core/Common/LinearDiskCache.h | 3 +- Source/Core/Common/LogManager.cpp | 10 +-- Source/Core/Common/LogManager.h | 10 +-- Source/Core/Common/MathUtil.cpp | 4 +- Source/Core/Common/MathUtil.h | 6 +- Source/Core/Common/MemArena.cpp | 6 +- Source/Core/Common/MemArena.h | 2 +- Source/Core/Common/MemoryUtil.cpp | 6 +- Source/Core/Common/Misc.cpp | 2 +- Source/Core/Common/MsgHandler.cpp | 6 +- Source/Core/Common/NandPaths.cpp | 7 +- Source/Core/Common/NandPaths.h | 2 +- Source/Core/Common/SDCardUtil.cpp | 14 +-- Source/Core/Common/SDCardUtil.h | 2 +- Source/Core/Common/SettingsHandler.cpp | 6 +- Source/Core/Common/SettingsHandler.h | 2 +- Source/Core/Common/StdConditionVariable.h | 2 +- Source/Core/Common/StringUtil.cpp | 8 +- Source/Core/Common/StringUtil.h | 11 ++- Source/Core/Common/SymbolDB.cpp | 2 +- Source/Core/Common/SymbolDB.h | 4 +- Source/Core/Common/SysConf.cpp | 6 +- Source/Core/Common/SysConf.h | 2 + Source/Core/Common/Thread.cpp | 4 +- Source/Core/Common/Thread.h | 14 +-- Source/Core/Common/Timer.cpp | 6 +- Source/Core/Common/Timer.h | 2 +- Source/Core/Common/Version.cpp | 2 +- Source/Core/Common/stdafx.cpp | 2 +- Source/Core/Common/x64ABI.cpp | 4 +- Source/Core/Common/x64ABI.h | 2 +- Source/Core/Common/x64Analyzer.cpp | 2 +- Source/Core/Common/x64Analyzer.h | 2 +- Source/Core/Common/x64CPUDetect.cpp | 11 ++- Source/Core/Common/x64Emitter.cpp | 10 +-- Source/Core/Common/x64Emitter.h | 4 +- Source/Core/Common/x64FPURoundMode.cpp | 6 +- Source/Core/Core/ARDecrypt.cpp | 4 +- Source/Core/Core/ARDecrypt.h | 5 +- Source/Core/Core/ActionReplay.cpp | 17 ++-- Source/Core/Core/ActionReplay.h | 2 +- Source/Core/Core/ArmMemTools.cpp | 31 ++----- Source/Core/Core/Boot/Boot.cpp | 56 ++++++------ Source/Core/Core/Boot/Boot.h | 4 +- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 37 ++++---- Source/Core/Core/Boot/Boot_DOL.cpp | 9 +- Source/Core/Core/Boot/Boot_DOL.h | 2 +- Source/Core/Core/Boot/Boot_ELF.cpp | 13 +-- Source/Core/Core/Boot/Boot_WiiWAD.cpp | 35 ++++---- Source/Core/Core/Boot/ElfReader.cpp | 11 +-- Source/Core/Core/Boot/ElfReader.h | 2 +- Source/Core/Core/BootManager.cpp | 32 +++---- Source/Core/Core/ConfigManager.cpp | 14 +-- Source/Core/Core/ConfigManager.h | 8 +- Source/Core/Core/Core.cpp | 90 +++++++++---------- Source/Core/Core/Core.h | 4 +- Source/Core/Core/CoreParameter.cpp | 32 +++---- Source/Core/Core/CoreParameter.h | 3 +- Source/Core/Core/CoreTiming.cpp | 18 ++-- Source/Core/Core/CoreTiming.h | 5 +- Source/Core/Core/DSP/DSPAccelerator.cpp | 12 +-- Source/Core/Core/DSP/DSPAnalyzer.cpp | 8 +- Source/Core/Core/DSP/DSPAnalyzer.h | 2 +- Source/Core/Core/DSP/DSPBreakpoints.h | 2 +- Source/Core/Core/DSP/DSPCodeUtil.cpp | 12 +-- Source/Core/Core/DSP/DSPCodeUtil.h | 2 +- Source/Core/Core/DSP/DSPCommon.h | 3 +- Source/Core/Core/DSP/DSPCore.cpp | 22 ++--- Source/Core/Core/DSP/DSPCore.h | 6 +- Source/Core/Core/DSP/DSPEmitter.cpp | 12 +-- Source/Core/Core/DSP/DSPEmitter.h | 12 +-- Source/Core/Core/DSP/DSPHWInterface.cpp | 22 ++--- Source/Core/Core/DSP/DSPHWInterface.h | 2 +- Source/Core/Core/DSP/DSPIntCCUtil.cpp | 6 +- Source/Core/Core/DSP/DSPIntCCUtil.h | 2 +- Source/Core/Core/DSP/DSPIntExtOps.cpp | 6 +- Source/Core/Core/DSP/DSPIntExtOps.h | 2 +- Source/Core/Core/DSP/DSPIntUtil.h | 10 +-- Source/Core/Core/DSP/DSPInterpreter.cpp | 10 +-- Source/Core/Core/DSP/DSPInterpreter.h | 2 +- Source/Core/Core/DSP/DSPMemoryMap.cpp | 8 +- Source/Core/Core/DSP/DSPMemoryMap.h | 7 +- Source/Core/Core/DSP/DSPStacks.cpp | 6 +- Source/Core/Core/DSP/DSPStacks.h | 2 +- Source/Core/Core/DSP/DSPTables.cpp | 10 +-- Source/Core/Core/DSP/DSPTables.h | 5 +- Source/Core/Core/DSP/DspIntArithmetic.cpp | 6 +- Source/Core/Core/DSP/DspIntBranch.cpp | 12 +-- Source/Core/Core/DSP/DspIntLoadStore.cpp | 6 +- Source/Core/Core/DSP/DspIntMisc.cpp | 7 +- Source/Core/Core/DSP/DspIntMultiplier.cpp | 6 +- Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp | 8 +- Source/Core/Core/DSP/Jit/DSPJitBranch.cpp | 8 +- Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp | 4 +- Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp | 4 +- Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp | 6 +- Source/Core/Core/DSP/Jit/DSPJitMisc.cpp | 4 +- Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp | 6 +- Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp | 6 +- Source/Core/Core/DSP/Jit/DSPJitRegCache.h | 2 +- Source/Core/Core/DSP/Jit/DSPJitUtil.cpp | 8 +- Source/Core/Core/DSP/LabelMap.cpp | 4 +- Source/Core/Core/DSP/LabelMap.h | 2 +- Source/Core/Core/DSP/assemble.cpp | 18 ++-- Source/Core/Core/DSP/assemble.h | 9 +- Source/Core/Core/DSP/disassemble.cpp | 13 +-- Source/Core/Core/DSP/disassemble.h | 7 +- Source/Core/Core/DSPEmulator.cpp | 6 +- Source/Core/Core/DSPEmulator.h | 4 +- .../Core/Core/Debugger/Debugger_SymbolMap.cpp | 17 ++-- .../Core/Core/Debugger/Debugger_SymbolMap.h | 2 +- Source/Core/Core/Debugger/Dump.cpp | 9 +- Source/Core/Core/Debugger/Dump.h | 2 +- .../Core/Core/Debugger/PPCDebugInterface.cpp | 22 ++--- Source/Core/Core/Debugger/PPCDebugInterface.h | 2 +- Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 13 ++- Source/Core/Core/FifoPlayer/FifoAnalyzer.h | 6 +- Source/Core/Core/FifoPlayer/FifoDataFile.cpp | 6 +- Source/Core/Core/FifoPlayer/FifoDataFile.h | 3 +- Source/Core/Core/FifoPlayer/FifoFileStruct.h | 2 +- .../Core/FifoPlayer/FifoPlaybackAnalyzer.cpp | 14 +-- .../Core/FifoPlayer/FifoPlaybackAnalyzer.h | 6 +- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 25 +++--- Source/Core/Core/FifoPlayer/FifoPlayer.h | 3 +- .../Core/FifoPlayer/FifoRecordAnalyzer.cpp | 15 ++-- .../Core/Core/FifoPlayer/FifoRecordAnalyzer.h | 6 +- Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 11 +-- Source/Core/Core/FifoPlayer/FifoRecorder.h | 4 +- Source/Core/Core/GeckoCode.cpp | 16 ++-- Source/Core/Core/GeckoCode.h | 8 +- Source/Core/Core/GeckoCodeConfig.cpp | 12 +-- Source/Core/Core/GeckoCodeConfig.h | 4 +- Source/Core/Core/HLE/HLE.cpp | 23 +++-- Source/Core/Core/HLE/HLE.h | 3 +- Source/Core/Core/HLE/HLE_Misc.cpp | 39 ++++---- Source/Core/Core/HLE/HLE_OS.cpp | 10 +-- Source/Core/Core/HLE/HLE_OS.h | 2 +- Source/Core/Core/HW/AudioInterface.cpp | 23 +++-- Source/Core/Core/HW/AudioInterface.h | 2 +- Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp | 23 ++--- Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp | 25 ++---- Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp | 10 +-- Source/Core/Core/HW/CPU.cpp | 20 ++--- Source/Core/Core/HW/CPU.h | 2 +- Source/Core/Core/HW/DSP.cpp | 24 ++--- Source/Core/Core/HW/DSP.h | 3 +- Source/Core/Core/HW/DSPHLE/DSPHLE.cpp | 26 +++--- Source/Core/Core/HW/DSPHLE/DSPHLE.h | 9 +- Source/Core/Core/HW/DSPHLE/HLEMixer.cpp | 6 +- Source/Core/Core/HW/DSPHLE/HLEMixer.h | 4 +- Source/Core/Core/HW/DSPHLE/MailHandler.cpp | 2 +- Source/Core/Core/HW/DSPHLE/MailHandler.h | 4 +- .../Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp | 13 +-- Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h | 4 +- .../Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 16 ++-- .../Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h | 2 +- .../Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 10 +-- .../Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp | 10 +-- .../Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h | 2 +- .../Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp | 9 +- Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h | 2 +- .../DSPHLE/UCodes/UCode_InitAudioSystem.cpp | 6 +- .../HW/DSPHLE/UCodes/UCode_InitAudioSystem.h | 2 +- .../Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp | 11 +-- Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h | 2 +- .../Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp | 15 ++-- .../Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h | 4 +- .../HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp | 6 +- .../HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp | 10 +-- .../HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp | 14 +-- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 18 ++-- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h | 10 +-- .../Core/Core/HW/DSPLLE/DSPDebugInterface.cpp | 12 ++- .../Core/Core/HW/DSPLLE/DSPDebugInterface.h | 4 +- Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 24 ++--- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 53 ++++++----- Source/Core/Core/HW/DSPLLE/DSPLLE.h | 9 +- Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp | 10 ++- Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h | 4 +- Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp | 20 ++--- Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp | 12 +-- Source/Core/Core/HW/DSPLLE/DSPSymbols.h | 4 +- Source/Core/Core/HW/DVDInterface.cpp | 30 +++---- Source/Core/Core/HW/DVDInterface.h | 3 +- Source/Core/Core/HW/EXI.cpp | 20 ++--- Source/Core/Core/HW/EXI.h | 8 +- Source/Core/Core/HW/EXI_Channel.cpp | 12 +-- Source/Core/Core/HW/EXI_Channel.h | 6 +- Source/Core/Core/HW/EXI_Device.cpp | 23 +++-- Source/Core/Core/HW/EXI_Device.h | 4 +- Source/Core/Core/HW/EXI_DeviceAD16.cpp | 6 +- Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp | 6 +- Source/Core/Core/HW/EXI_DeviceEthernet.cpp | 11 +-- Source/Core/Core/HW/EXI_DeviceEthernet.h | 2 +- Source/Core/Core/HW/EXI_DeviceGecko.cpp | 6 +- Source/Core/Core/HW/EXI_DeviceGecko.h | 7 +- Source/Core/Core/HW/EXI_DeviceIPL.cpp | 22 ++--- Source/Core/Core/HW/EXI_DeviceIPL.h | 4 +- Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp | 24 ++--- Source/Core/Core/HW/EXI_DeviceMemoryCard.h | 2 +- Source/Core/Core/HW/EXI_DeviceMic.cpp | 14 ++- Source/Core/Core/HW/EXI_DeviceMic.h | 2 +- Source/Core/Core/HW/GCMemcard.cpp | 6 +- Source/Core/Core/HW/GCMemcard.h | 11 +-- Source/Core/Core/HW/GCPad.cpp | 13 +-- Source/Core/Core/HW/GCPad.h | 6 +- Source/Core/Core/HW/GCPadEmu.cpp | 4 +- Source/Core/Core/HW/GCPadEmu.h | 2 +- Source/Core/Core/HW/GPFifo.cpp | 17 ++-- Source/Core/Core/HW/GPFifo.h | 2 +- Source/Core/Core/HW/HW.cpp | 43 ++++----- Source/Core/Core/HW/HW.h | 4 +- Source/Core/Core/HW/MMIO.cpp | 6 +- Source/Core/Core/HW/MMIO.h | 4 +- Source/Core/Core/HW/MMIOHandlers.h | 4 +- Source/Core/Core/HW/Memmap.cpp | 48 +++++----- Source/Core/Core/HW/Memmap.h | 4 +- Source/Core/Core/HW/MemmapFunctions.cpp | 19 ++-- Source/Core/Core/HW/MemoryInterface.cpp | 10 +-- Source/Core/Core/HW/MemoryInterface.h | 2 +- Source/Core/Core/HW/ProcessorInterface.cpp | 23 ++--- Source/Core/Core/HW/ProcessorInterface.h | 2 +- Source/Core/Core/HW/SI.cpp | 24 ++--- Source/Core/Core/HW/SI.h | 5 +- Source/Core/Core/HW/SI_Device.cpp | 12 +-- Source/Core/Core/HW/SI_Device.h | 2 +- Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp | 11 ++- Source/Core/Core/HW/SI_DeviceDanceMat.cpp | 26 +++--- Source/Core/Core/HW/SI_DeviceDanceMat.h | 5 +- Source/Core/Core/HW/SI_DeviceGBA.cpp | 10 ++- Source/Core/Core/HW/SI_DeviceGCController.cpp | 26 +++--- Source/Core/Core/HW/SI_DeviceGCController.h | 4 +- .../Core/Core/HW/SI_DeviceGCSteeringWheel.cpp | 25 +++--- .../Core/Core/HW/SI_DeviceGCSteeringWheel.h | 5 +- Source/Core/Core/HW/Sram.cpp | 5 +- Source/Core/Core/HW/Sram.h | 2 +- Source/Core/Core/HW/StreamADPCM.cpp | 4 +- Source/Core/Core/HW/StreamADPCM.h | 2 +- Source/Core/Core/HW/SystemTimers.cpp | 39 ++++---- Source/Core/Core/HW/SystemTimers.h | 2 +- Source/Core/Core/HW/VideoInterface.cpp | 26 +++--- Source/Core/Core/HW/VideoInterface.h | 2 +- Source/Core/Core/HW/WII_IPC.cpp | 19 ++-- Source/Core/Core/HW/WII_IPC.h | 3 +- Source/Core/Core/HW/Wiimote.cpp | 17 ++-- Source/Core/Core/HW/Wiimote.h | 4 +- .../HW/WiimoteEmu/Attachment/Attachment.cpp | 2 +- .../HW/WiimoteEmu/Attachment/Attachment.h | 4 +- .../Core/HW/WiimoteEmu/Attachment/Classic.cpp | 3 +- .../Core/HW/WiimoteEmu/Attachment/Classic.h | 2 +- .../Core/HW/WiimoteEmu/Attachment/Drums.cpp | 3 +- .../Core/HW/WiimoteEmu/Attachment/Drums.h | 2 +- .../Core/HW/WiimoteEmu/Attachment/Guitar.cpp | 3 +- .../Core/HW/WiimoteEmu/Attachment/Guitar.h | 2 +- .../Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp | 6 +- .../Core/HW/WiimoteEmu/Attachment/Nunchuk.h | 2 +- .../HW/WiimoteEmu/Attachment/Turntable.cpp | 3 +- .../Core/HW/WiimoteEmu/Attachment/Turntable.h | 2 +- .../Core/HW/WiimoteEmu/EmuSubroutines.cpp | 17 ++-- Source/Core/Core/HW/WiimoteEmu/Encryption.cpp | 4 +- Source/Core/Core/HW/WiimoteEmu/MatrixMath.h | 2 +- Source/Core/Core/HW/WiimoteEmu/Speaker.cpp | 8 +- Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h | 4 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 35 ++++---- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 21 ++--- Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h | 2 +- Source/Core/Core/HW/WiimoteReal/IODummy.cpp | 23 ++--- Source/Core/Core/HW/WiimoteReal/IONix.cpp | 23 ++--- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 13 +-- Source/Core/Core/HW/WiimoteReal/IOdarwin.mm | 4 +- .../Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 21 +++-- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 16 ++-- Source/Core/Core/IPC_HLE/ICMP.h | 2 +- Source/Core/Core/IPC_HLE/ICMPWin.cpp | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 54 +++++------ Source/Core/Core/IPC_HLE/WII_IPC_HLE.h | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h | 7 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 34 +++---- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h | 2 +- .../IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 17 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 4 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 24 ++--- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h | 5 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 24 +++-- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 13 +-- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.h | 10 ++- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 24 ++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.h | 7 +- .../IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 6 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 4 +- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp | 17 ++-- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_stm.h | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 22 ++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.h | 12 +-- .../IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp | 11 +-- .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 21 ++--- .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h | 5 +- Source/Core/Core/IPC_HLE/WII_Socket.cpp | 12 +-- Source/Core/Core/IPC_HLE/WII_Socket.h | 16 ++-- Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp | 5 +- Source/Core/Core/MemTools.h | 2 +- Source/Core/Core/Movie.cpp | 44 ++++----- Source/Core/Core/Movie.h | 8 +- Source/Core/Core/NetPlayClient.cpp | 26 +++--- Source/Core/Core/NetPlayClient.h | 22 ++--- Source/Core/Core/NetPlayProto.h | 7 +- Source/Core/Core/NetPlayServer.cpp | 2 +- Source/Core/Core/NetPlayServer.h | 18 ++-- Source/Core/Core/PatchEngine.cpp | 19 ++-- Source/Core/Core/PatchEngine.h | 2 +- Source/Core/Core/PowerPC/GDBStub.cpp | 21 +---- Source/Core/Core/PowerPC/GDBStub.h | 12 +-- Source/Core/Core/PowerPC/Gekko.h | 2 +- .../Core/PowerPC/Interpreter/Interpreter.cpp | 16 ++-- .../Core/PowerPC/Interpreter/Interpreter.h | 20 ++--- .../Interpreter/Interpreter_Branch.cpp | 4 +- .../PowerPC/Interpreter/Interpreter_FPUtils.h | 6 +- .../Interpreter/Interpreter_FloatingPoint.cpp | 10 +-- .../Interpreter/Interpreter_Integer.cpp | 2 +- .../Interpreter/Interpreter_LoadStore.cpp | 10 +-- .../Interpreter_LoadStorePaired.cpp | 4 +- .../Interpreter/Interpreter_Paired.cpp | 10 +-- .../Interpreter_SystemRegisters.cpp | 12 +-- .../Interpreter/Interpreter_Tables.cpp | 2 +- .../PowerPC/Interpreter/Interpreter_Tables.h | 2 +- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 18 ++-- Source/Core/Core/PowerPC/Jit64/Jit.h | 35 ++++---- .../Core/Core/PowerPC/Jit64/Jit64_Tables.cpp | 4 +- Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h | 6 +- Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 6 +- Source/Core/Core/PowerPC/Jit64/JitAsm.h | 2 +- .../Core/Core/PowerPC/Jit64/JitRegCache.cpp | 6 +- Source/Core/Core/PowerPC/Jit64/JitRegCache.h | 2 +- Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp | 8 +- .../Core/PowerPC/Jit64/Jit_FloatingPoint.cpp | 8 +- .../Core/Core/PowerPC/Jit64/Jit_Integer.cpp | 6 +- .../Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp | 8 +- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 10 +-- .../PowerPC/Jit64/Jit_LoadStorePaired.cpp | 10 +-- Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp | 6 +- .../PowerPC/Jit64/Jit_SystemRegisters.cpp | 10 +-- Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp | 8 +- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 16 ++-- Source/Core/Core/PowerPC/Jit64IL/JitIL.h | 37 ++++---- Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp | 8 +- Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h | 4 +- .../Core/PowerPC/Jit64IL/JitIL_Tables.cpp | 2 +- .../Core/Core/PowerPC/Jit64IL/JitIL_Tables.h | 6 +- Source/Core/Core/PowerPC/JitArm32/Jit.cpp | 51 ++++------- Source/Core/Core/PowerPC/JitArm32/Jit.h | 33 +++---- .../Core/PowerPC/JitArm32/JitArmCache.cpp | 25 ++---- .../Core/Core/PowerPC/JitArm32/JitArmCache.h | 2 +- .../PowerPC/JitArm32/JitArm_BackPatch.cpp | 29 ++---- .../Core/PowerPC/JitArm32/JitArm_Branch.cpp | 37 +++----- .../Core/PowerPC/JitArm32/JitArm_FPUtils.h | 13 +-- .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 46 ++++------ .../Core/PowerPC/JitArm32/JitArm_Integer.cpp | 35 +++----- .../PowerPC/JitArm32/JitArm_LoadStore.cpp | 42 +++------ .../JitArm32/JitArm_LoadStoreFloating.cpp | 44 ++++----- .../JitArm32/JitArm_LoadStorePaired.cpp | 21 ++--- .../Core/PowerPC/JitArm32/JitArm_Paired.cpp | 38 +++----- .../JitArm32/JitArm_SystemRegisters.cpp | 36 +++----- .../Core/PowerPC/JitArm32/JitArm_Tables.cpp | 25 ++---- .../Core/PowerPC/JitArm32/JitArm_Tables.h | 23 ++--- Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp | 40 +++------ Source/Core/Core/PowerPC/JitArm32/JitAsm.h | 24 ++--- .../Core/PowerPC/JitArm32/JitFPRCache.cpp | 23 ++--- .../Core/Core/PowerPC/JitArm32/JitFPRCache.h | 8 +- .../Core/PowerPC/JitArm32/JitRegCache.cpp | 23 ++--- .../Core/Core/PowerPC/JitArm32/JitRegCache.h | 6 +- Source/Core/Core/PowerPC/JitArmIL/IR_Arm.cpp | 19 ++-- Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp | 34 +++---- Source/Core/Core/PowerPC/JitArmIL/JitIL.h | 16 ++-- .../Core/Core/PowerPC/JitArmIL/JitILAsm.cpp | 24 +++-- Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h | 7 +- .../Core/PowerPC/JitArmIL/JitIL_Branch.cpp | 15 ++-- .../Core/PowerPC/JitArmIL/JitIL_Tables.cpp | 8 +- .../Core/Core/PowerPC/JitArmIL/JitIL_Tables.h | 6 +- .../Core/PowerPC/JitCommon/JitAsmCommon.cpp | 9 +- .../Core/PowerPC/JitCommon/JitAsmCommon.h | 2 +- .../Core/PowerPC/JitCommon/JitBackpatch.cpp | 11 +-- .../Core/PowerPC/JitCommon/JitBackpatch.h | 6 +- .../Core/Core/PowerPC/JitCommon/JitBase.cpp | 5 +- Source/Core/Core/PowerPC/JitCommon/JitBase.h | 33 +++---- .../Core/Core/PowerPC/JitCommon/JitCache.cpp | 13 ++- Source/Core/Core/PowerPC/JitCommon/JitCache.h | 4 +- .../Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 8 +- Source/Core/Core/PowerPC/JitCommon/Jit_Util.h | 3 +- Source/Core/Core/PowerPC/JitILCommon/IR.cpp | 15 ++-- Source/Core/Core/PowerPC/JitILCommon/IR.h | 3 +- .../Core/Core/PowerPC/JitILCommon/JitILBase.h | 20 ++--- .../PowerPC/JitILCommon/JitILBase_Branch.cpp | 4 +- .../JitILCommon/JitILBase_FloatingPoint.cpp | 4 +- .../PowerPC/JitILCommon/JitILBase_Integer.cpp | 2 +- .../JitILCommon/JitILBase_LoadStore.cpp | 4 +- .../JitILBase_LoadStoreFloating.cpp | 4 +- .../JitILCommon/JitILBase_LoadStorePaired.cpp | 4 +- .../PowerPC/JitILCommon/JitILBase_Paired.cpp | 4 +- .../JitILCommon/JitILBase_SystemRegisters.cpp | 8 +- Source/Core/Core/PowerPC/JitInterface.cpp | 28 +++--- Source/Core/Core/PowerPC/JitInterface.h | 4 +- Source/Core/Core/PowerPC/LUT_frsqrtex.cpp | 2 +- Source/Core/Core/PowerPC/PPCAnalyst.cpp | 23 ++--- Source/Core/Core/PowerPC/PPCAnalyst.h | 9 +- Source/Core/Core/PowerPC/PPCCache.cpp | 12 +-- Source/Core/Core/PowerPC/PPCCache.h | 2 +- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 19 ++-- Source/Core/Core/PowerPC/PPCSymbolDB.h | 8 +- Source/Core/Core/PowerPC/PPCTables.cpp | 17 ++-- Source/Core/Core/PowerPC/PPCTables.h | 4 +- Source/Core/Core/PowerPC/PowerPC.cpp | 32 +++---- Source/Core/Core/PowerPC/PowerPC.h | 13 +-- Source/Core/Core/PowerPC/Profiler.cpp | 2 +- Source/Core/Core/PowerPC/SignatureDB.cpp | 13 +-- Source/Core/Core/PowerPC/SignatureDB.h | 4 +- Source/Core/Core/State.cpp | 40 +++++---- Source/Core/Core/Tracer.cpp | 13 ++- Source/Core/Core/VolumeHandler.cpp | 4 +- Source/Core/Core/VolumeHandler.h | 5 +- Source/Core/Core/ec_wii.cpp | 12 +-- Source/Core/Core/ec_wii.h | 2 +- Source/Core/Core/x64MemTools.cpp | 27 +++--- Source/Core/DiscIO/BannerLoader.cpp | 10 +-- Source/Core/DiscIO/BannerLoader.h | 4 +- Source/Core/DiscIO/BannerLoaderGC.cpp | 6 +- Source/Core/DiscIO/BannerLoaderGC.h | 7 +- Source/Core/DiscIO/BannerLoaderWii.cpp | 15 ++-- Source/Core/DiscIO/BannerLoaderWii.h | 2 +- Source/Core/DiscIO/Blob.cpp | 17 ++-- Source/Core/DiscIO/Blob.h | 2 +- Source/Core/DiscIO/CISOBlob.cpp | 4 +- Source/Core/DiscIO/CISOBlob.h | 4 +- Source/Core/DiscIO/CompressedBlob.cpp | 8 +- Source/Core/DiscIO/CompressedBlob.h | 4 +- Source/Core/DiscIO/DiscScrubber.cpp | 10 +-- Source/Core/DiscIO/DiscScrubber.h | 4 +- Source/Core/DiscIO/DriveBlob.cpp | 4 +- Source/Core/DiscIO/DriveBlob.h | 4 +- Source/Core/DiscIO/FileBlob.cpp | 2 +- Source/Core/DiscIO/FileBlob.h | 4 +- Source/Core/DiscIO/FileHandlerARC.cpp | 8 +- Source/Core/DiscIO/FileHandlerARC.h | 4 +- Source/Core/DiscIO/FileMonitor.cpp | 20 ++--- Source/Core/DiscIO/FileMonitor.h | 2 +- Source/Core/DiscIO/FileSystemGCWii.cpp | 14 +-- Source/Core/DiscIO/FileSystemGCWii.h | 2 +- Source/Core/DiscIO/Filesystem.cpp | 7 +- Source/Core/DiscIO/Filesystem.h | 2 +- Source/Core/DiscIO/NANDContentLoader.cpp | 15 ++-- Source/Core/DiscIO/NANDContentLoader.h | 13 +-- Source/Core/DiscIO/Volume.h | 4 +- Source/Core/DiscIO/VolumeCommon.cpp | 2 +- Source/Core/DiscIO/VolumeCreator.cpp | 16 ++-- Source/Core/DiscIO/VolumeCreator.h | 2 +- Source/Core/DiscIO/VolumeDirectory.cpp | 9 +- Source/Core/DiscIO/VolumeDirectory.h | 4 +- Source/Core/DiscIO/VolumeGC.cpp | 6 +- Source/Core/DiscIO/VolumeGC.h | 4 +- Source/Core/DiscIO/VolumeWad.cpp | 8 +- Source/Core/DiscIO/VolumeWad.h | 6 +- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 7 +- Source/Core/DiscIO/VolumeWiiCrypted.h | 5 +- Source/Core/DiscIO/WbfsBlob.cpp | 4 +- Source/Core/DiscIO/WbfsBlob.h | 4 +- Source/Core/DiscIO/WiiWad.cpp | 9 +- Source/Core/DiscIO/WiiWad.h | 8 +- Source/Core/DiscIO/stdafx.cpp | 2 +- Source/Core/DolphinWX/ARCodeAddEdit.cpp | 6 +- Source/Core/DolphinWX/ARCodeAddEdit.h | 2 +- Source/Core/DolphinWX/AboutDolphin.cpp | 8 +- .../Core/DolphinWX/Android/ButtonManager.cpp | 24 ++--- Source/Core/DolphinWX/Android/ButtonManager.h | 25 ++---- Source/Core/DolphinWX/CheatsWindow.cpp | 25 +++--- Source/Core/DolphinWX/CheatsWindow.h | 10 +-- Source/Core/DolphinWX/ConfigMain.cpp | 48 +++++----- Source/Core/DolphinWX/ConfigMain.h | 4 +- .../Core/DolphinWX/Debugger/BreakpointDlg.cpp | 10 +-- .../DolphinWX/Debugger/BreakpointView.cpp | 14 +-- .../Core/DolphinWX/Debugger/BreakpointView.h | 3 +- .../DolphinWX/Debugger/BreakpointWindow.cpp | 22 ++--- Source/Core/DolphinWX/Debugger/CodeView.cpp | 21 +++-- Source/Core/DolphinWX/Debugger/CodeView.h | 6 +- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 59 ++++++------ Source/Core/DolphinWX/Debugger/CodeWindow.h | 16 ++-- .../Debugger/CodeWindowFunctions.cpp | 63 +++++++------ .../DolphinWX/Debugger/DSPDebugWindow.cpp | 16 ++-- .../Core/DolphinWX/Debugger/DSPDebugWindow.h | 20 ++--- .../DolphinWX/Debugger/DSPRegisterView.cpp | 6 +- .../Core/DolphinWX/Debugger/DebuggerPanel.cpp | 19 ++-- .../Core/DolphinWX/Debugger/DebuggerPanel.h | 3 +- .../DolphinWX/Debugger/DebuggerUIUtil.cpp | 2 +- Source/Core/DolphinWX/Debugger/JitWindow.cpp | 33 ++++--- Source/Core/DolphinWX/Debugger/JitWindow.h | 10 +-- .../DolphinWX/Debugger/MemoryCheckDlg.cpp | 12 +-- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 17 ++-- Source/Core/DolphinWX/Debugger/MemoryView.h | 6 +- .../Core/DolphinWX/Debugger/MemoryWindow.cpp | 29 +++--- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 8 +- .../Core/DolphinWX/Debugger/RegisterView.cpp | 12 +-- Source/Core/DolphinWX/Debugger/RegisterView.h | 2 +- .../DolphinWX/Debugger/RegisterWindow.cpp | 6 +- Source/Core/DolphinWX/FifoPlayerDlg.cpp | 22 ++--- Source/Core/DolphinWX/Frame.cpp | 46 +++++----- Source/Core/DolphinWX/Frame.h | 23 ++--- Source/Core/DolphinWX/FrameAui.cpp | 14 ++- Source/Core/DolphinWX/FrameTools.cpp | 80 ++++++++--------- Source/Core/DolphinWX/GLInterface/AGL.cpp | 16 ++-- Source/Core/DolphinWX/GLInterface/AGL.h | 2 +- Source/Core/DolphinWX/GLInterface/EGL.cpp | 28 ++---- Source/Core/DolphinWX/GLInterface/EGL.h | 5 +- .../Core/DolphinWX/GLInterface/GLInterface.h | 14 +-- Source/Core/DolphinWX/GLInterface/GLX.cpp | 11 +-- Source/Core/DolphinWX/GLInterface/GLX.h | 4 +- .../DolphinWX/GLInterface/InterfaceBase.h | 2 + .../Core/DolphinWX/GLInterface/Platform.cpp | 23 ++--- Source/Core/DolphinWX/GLInterface/WGL.cpp | 15 ++-- Source/Core/DolphinWX/GLInterface/WGL.h | 2 +- .../DolphinWX/GLInterface/Wayland_Util.cpp | 7 +- .../Core/DolphinWX/GLInterface/X11_Util.cpp | 25 ++---- Source/Core/DolphinWX/GameListCtrl.cpp | 57 ++++++------ Source/Core/DolphinWX/GameListCtrl.h | 4 +- Source/Core/DolphinWX/GeckoCodeDiag.cpp | 8 +- Source/Core/DolphinWX/GeckoCodeDiag.h | 6 +- Source/Core/DolphinWX/Globals.h | 2 +- Source/Core/DolphinWX/HotkeyDlg.cpp | 4 +- Source/Core/DolphinWX/HotkeyDlg.h | 8 +- Source/Core/DolphinWX/ISOFile.cpp | 33 +++---- Source/Core/DolphinWX/ISOFile.h | 6 +- Source/Core/DolphinWX/ISOProperties.cpp | 35 ++++---- Source/Core/DolphinWX/ISOProperties.h | 15 ++-- Source/Core/DolphinWX/InputConfigDiag.cpp | 10 +-- Source/Core/DolphinWX/InputConfigDiag.h | 16 ++-- .../Core/DolphinWX/InputConfigDiagBitmaps.cpp | 4 +- Source/Core/DolphinWX/LogConfigWindow.cpp | 10 +-- Source/Core/DolphinWX/LogWindow.cpp | 12 +-- Source/Core/DolphinWX/LogWindow.h | 7 +- Source/Core/DolphinWX/Main.cpp | 37 ++++---- Source/Core/DolphinWX/Main.h | 2 +- Source/Core/DolphinWX/MainNoGUI.cpp | 36 ++++---- Source/Core/DolphinWX/MemcardManager.cpp | 8 +- Source/Core/DolphinWX/MemcardManager.h | 6 +- .../DolphinWX/MemoryCards/WiiSaveCrypted.cpp | 9 +- .../DolphinWX/MemoryCards/WiiSaveCrypted.h | 7 +- Source/Core/DolphinWX/NetWindow.cpp | 23 ++--- Source/Core/DolphinWX/NetWindow.h | 11 +-- Source/Core/DolphinWX/PHackSettings.cpp | 8 +- Source/Core/DolphinWX/PHackSettings.h | 3 +- Source/Core/DolphinWX/PatchAddEdit.cpp | 4 +- Source/Core/DolphinWX/PatchAddEdit.h | 3 +- Source/Core/DolphinWX/TASInputDlg.cpp | 4 +- Source/Core/DolphinWX/TASInputDlg.h | 6 +- Source/Core/DolphinWX/UDPConfigDiag.cpp | 15 ++-- Source/Core/DolphinWX/UDPConfigDiag.h | 4 +- Source/Core/DolphinWX/VideoConfigDiag.cpp | 14 +-- Source/Core/DolphinWX/VideoConfigDiag.h | 15 ++-- Source/Core/DolphinWX/WXInputBase.cpp | 2 +- Source/Core/DolphinWX/WXInputBase.h | 2 +- Source/Core/DolphinWX/WiimoteConfigDiag.cpp | 11 ++- Source/Core/DolphinWX/WiimoteConfigDiag.h | 10 +-- Source/Core/DolphinWX/WxUtils.cpp | 5 +- Source/Core/DolphinWX/X11Utils.cpp | 25 ++---- Source/Core/DolphinWX/X11Utils.h | 7 +- Source/Core/DolphinWX/stdafx.cpp | 2 +- Source/Core/InputCommon/ControllerEmu.cpp | 2 +- Source/Core/InputCommon/ControllerEmu.h | 11 ++- .../ControllerInterface/Android/Android.cpp | 2 +- .../ControllerInterface/Android/Android.h | 4 +- .../ControllerInterface.cpp | 21 +++-- .../ControllerInterface/ControllerInterface.h | 17 ++-- .../ControllerInterface/DInput/DInput.cpp | 8 +- .../ControllerInterface/DInput/DInput.h | 2 +- .../DInput/DInputJoystick.cpp | 6 +- .../DInput/DInputJoystick.h | 4 +- .../DInput/DInputKeyboardMouse.cpp | 7 +- .../DInput/DInputKeyboardMouse.h | 2 +- .../ControllerInterface/Device.cpp | 6 +- .../InputCommon/ControllerInterface/Device.h | 2 +- .../ControllerInterface/ExpressionParser.cpp | 7 +- .../ControllerInterface/ExpressionParser.h | 2 +- .../ForceFeedback/ForceFeedbackDevice.cpp | 2 +- .../ForceFeedback/ForceFeedbackDevice.h | 8 +- .../InputCommon/ControllerInterface/OSX/OSX.h | 2 +- .../ControllerInterface/OSX/OSX.mm | 6 +- .../ControllerInterface/OSX/OSXJoystick.h | 4 +- .../ControllerInterface/OSX/OSXJoystick.mm | 6 +- .../ControllerInterface/OSX/OSXKeyboard.h | 2 +- .../ControllerInterface/OSX/OSXKeyboard.mm | 6 +- .../ControllerInterface/SDL/SDL.cpp | 8 +- .../InputCommon/ControllerInterface/SDL/SDL.h | 5 +- .../ControllerInterface/XInput/XInput.cpp | 2 +- .../ControllerInterface/XInput/XInput.h | 2 +- .../ControllerInterface/Xlib/XInput2.cpp | 6 +- .../ControllerInterface/Xlib/XInput2.h | 2 +- .../ControllerInterface/Xlib/Xlib.cpp | 2 +- .../ControllerInterface/Xlib/Xlib.h | 6 +- Source/Core/InputCommon/InputConfig.cpp | 6 +- Source/Core/InputCommon/InputConfig.h | 16 ++-- Source/Core/InputCommon/UDPWiimote.cpp | 21 ++--- Source/Core/InputCommon/UDPWiimote.h | 2 +- Source/Core/InputCommon/UDPWrapper.cpp | 6 +- Source/Core/InputCommon/UDPWrapper.h | 11 +-- Source/Core/InputCommon/X11InputBase.cpp | 4 +- Source/Core/InputCommon/X11InputBase.h | 2 +- Source/Core/InputCommon/stdafx.cpp | 2 +- Source/Core/VideoBackends/D3D/D3DBase.cpp | 10 +-- Source/Core/VideoBackends/D3D/D3DBase.h | 3 +- Source/Core/VideoBackends/D3D/D3DBlob.cpp | 3 +- Source/Core/VideoBackends/D3D/D3DBlob.h | 2 +- Source/Core/VideoBackends/D3D/D3DShader.cpp | 7 +- Source/Core/VideoBackends/D3D/D3DShader.h | 4 +- Source/Core/VideoBackends/D3D/D3DTexture.cpp | 4 +- Source/Core/VideoBackends/D3D/D3DUtil.cpp | 12 +-- Source/Core/VideoBackends/D3D/D3DUtil.h | 3 +- .../VideoBackends/D3D/FramebufferManager.cpp | 19 ++-- .../VideoBackends/D3D/FramebufferManager.h | 5 +- Source/Core/VideoBackends/D3D/GfxState.cpp | 6 +- Source/Core/VideoBackends/D3D/Globals.h | 9 +- .../VideoBackends/D3D/LineGeometryShader.cpp | 10 +-- .../VideoBackends/D3D/LineGeometryShader.h | 2 +- .../VideoBackends/D3D/NativeVertexFormat.cpp | 10 +-- .../VideoBackends/D3D/PSTextureEncoder.cpp | 19 ++-- .../Core/VideoBackends/D3D/PSTextureEncoder.h | 2 +- Source/Core/VideoBackends/D3D/PerfQuery.cpp | 7 +- Source/Core/VideoBackends/D3D/PerfQuery.h | 3 +- .../VideoBackends/D3D/PixelShaderCache.cpp | 25 +++--- .../Core/VideoBackends/D3D/PixelShaderCache.h | 5 +- .../VideoBackends/D3D/PointGeometryShader.cpp | 10 +-- .../VideoBackends/D3D/PointGeometryShader.h | 2 +- Source/Core/VideoBackends/D3D/Render.cpp | 57 ++++++------ Source/Core/VideoBackends/D3D/Render.h | 2 +- Source/Core/VideoBackends/D3D/Television.cpp | 16 ++-- Source/Core/VideoBackends/D3D/Television.h | 2 +- .../Core/VideoBackends/D3D/TextureCache.cpp | 24 ++--- Source/Core/VideoBackends/D3D/TextureCache.h | 5 +- .../Core/VideoBackends/D3D/TextureEncoder.h | 2 +- .../Core/VideoBackends/D3D/VertexManager.cpp | 30 +++---- Source/Core/VideoBackends/D3D/VertexManager.h | 6 +- .../VideoBackends/D3D/VertexShaderCache.cpp | 20 ++--- .../VideoBackends/D3D/VertexShaderCache.h | 10 +-- Source/Core/VideoBackends/D3D/VideoBackend.h | 2 +- Source/Core/VideoBackends/D3D/XFBEncoder.cpp | 15 ++-- Source/Core/VideoBackends/D3D/XFBEncoder.h | 2 +- Source/Core/VideoBackends/D3D/main.cpp | 58 ++++++------ Source/Core/VideoBackends/D3D/main.h | 4 +- Source/Core/VideoBackends/D3D/stdafx.cpp | 2 +- .../VideoBackends/OGL/FramebufferManager.cpp | 17 ++-- .../VideoBackends/OGL/FramebufferManager.h | 9 +- .../OGL/GLExtensions/ARB_ES2_compatibility.h | 2 +- .../GLExtensions/ARB_blend_func_extended.h | 2 +- .../OGL/GLExtensions/ARB_buffer_storage.h | 2 +- .../OGL/GLExtensions/ARB_debug_output.h | 2 +- .../ARB_draw_elements_base_vertex.h | 2 +- .../OGL/GLExtensions/ARB_framebuffer_object.h | 2 +- .../OGL/GLExtensions/ARB_get_program_binary.h | 2 +- .../OGL/GLExtensions/ARB_map_buffer_range.h | 2 +- .../OGL/GLExtensions/ARB_sample_shading.h | 2 +- .../OGL/GLExtensions/ARB_sampler_objects.h | 2 +- .../VideoBackends/OGL/GLExtensions/ARB_sync.h | 2 +- .../GLExtensions/ARB_uniform_buffer_object.h | 2 +- .../GLExtensions/ARB_vertex_array_object.h | 2 +- .../OGL/GLExtensions/ARB_viewport_array.h | 2 +- .../OGL/GLExtensions/GLExtensions.cpp | 9 +- .../OGL/GLExtensions/GLExtensions.h | 54 +++++------ .../OGL/GLExtensions/KHR_debug.h | 2 +- .../NV_framebuffer_multisample_coverage.h | 2 +- .../OGL/GLExtensions/NV_primitive_restart.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_1_1.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_1_2.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_1_3.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_1_4.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_1_5.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_2_0.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_3_0.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_3_1.h | 2 +- .../VideoBackends/OGL/GLExtensions/gl_3_2.h | 2 +- Source/Core/VideoBackends/OGL/GLUtil.cpp | 17 ++-- Source/Core/VideoBackends/OGL/GLUtil.h | 8 +- Source/Core/VideoBackends/OGL/Globals.h | 6 +- .../VideoBackends/OGL/NativeVertexFormat.cpp | 19 ++-- Source/Core/VideoBackends/OGL/PerfQuery.cpp | 8 +- Source/Core/VideoBackends/OGL/PerfQuery.h | 2 +- .../Core/VideoBackends/OGL/PostProcessing.cpp | 18 ++-- .../Core/VideoBackends/OGL/PostProcessing.h | 4 +- .../VideoBackends/OGL/ProgramShaderCache.cpp | 22 ++--- .../VideoBackends/OGL/ProgramShaderCache.h | 12 ++- Source/Core/VideoBackends/OGL/RasterFont.cpp | 6 +- Source/Core/VideoBackends/OGL/Render.cpp | 89 +++++++++--------- Source/Core/VideoBackends/OGL/Render.h | 2 +- .../Core/VideoBackends/OGL/SamplerCache.cpp | 4 +- Source/Core/VideoBackends/OGL/SamplerCache.h | 4 +- .../Core/VideoBackends/OGL/StreamBuffer.cpp | 16 ++-- Source/Core/VideoBackends/OGL/StreamBuffer.h | 6 +- .../Core/VideoBackends/OGL/TextureCache.cpp | 46 +++++----- Source/Core/VideoBackends/OGL/TextureCache.h | 9 +- .../VideoBackends/OGL/TextureConverter.cpp | 28 +++--- .../Core/VideoBackends/OGL/TextureConverter.h | 4 +- .../Core/VideoBackends/OGL/VertexManager.cpp | 42 +++++---- Source/Core/VideoBackends/OGL/VertexManager.h | 5 +- Source/Core/VideoBackends/OGL/VideoBackend.h | 2 +- Source/Core/VideoBackends/OGL/main.cpp | 88 +++++++++--------- Source/Core/VideoBackends/OGL/main.h | 2 +- Source/Core/VideoBackends/OGL/stdafx.cpp | 2 +- .../VideoBackends/Software/BPMemLoader.cpp | 19 ++-- .../Core/VideoBackends/Software/BPMemLoader.h | 4 +- .../VideoBackends/Software/CPMemLoader.cpp | 7 +- .../Core/VideoBackends/Software/CPMemLoader.h | 4 +- .../Core/VideoBackends/Software/Clipper.cpp | 12 +-- Source/Core/VideoBackends/Software/Clipper.h | 7 +- .../Core/VideoBackends/Software/DebugUtil.cpp | 26 +++--- .../Core/VideoBackends/Software/EfbCopy.cpp | 24 ++--- Source/Core/VideoBackends/Software/EfbCopy.h | 2 +- .../VideoBackends/Software/EfbInterface.cpp | 13 +-- .../VideoBackends/Software/EfbInterface.h | 2 +- .../VideoBackends/Software/HwRasterizer.cpp | 14 +-- .../VideoBackends/Software/HwRasterizer.h | 4 +- .../Software/NativeVertexFormat.h | 4 +- .../VideoBackends/Software/OpcodeDecoder.cpp | 27 +++--- .../VideoBackends/Software/OpcodeDecoder.h | 4 +- .../VideoBackends/Software/RasterFont.cpp | 6 +- .../VideoBackends/Software/Rasterizer.cpp | 20 ++--- .../Core/VideoBackends/Software/Rasterizer.h | 4 +- .../Software/SWCommandProcessor.cpp | 29 +++--- .../Software/SWCommandProcessor.h | 2 +- .../VideoBackends/Software/SWPixelEngine.cpp | 18 ++-- .../VideoBackends/Software/SWPixelEngine.h | 4 +- .../VideoBackends/Software/SWRenderer.cpp | 20 ++--- .../Core/VideoBackends/Software/SWRenderer.h | 6 +- .../VideoBackends/Software/SWStatistics.cpp | 2 +- .../VideoBackends/Software/SWStatistics.h | 4 +- .../VideoBackends/Software/SWVertexLoader.cpp | 27 +++--- .../VideoBackends/Software/SWVertexLoader.h | 8 +- .../VideoBackends/Software/SWVideoConfig.cpp | 6 +- .../VideoBackends/Software/SWVideoConfig.h | 2 +- Source/Core/VideoBackends/Software/SWmain.cpp | 57 ++++++------ .../Core/VideoBackends/Software/SetupUnit.cpp | 11 ++- .../Core/VideoBackends/Software/SetupUnit.h | 6 +- Source/Core/VideoBackends/Software/Tev.cpp | 22 ++--- Source/Core/VideoBackends/Software/Tev.h | 4 +- .../VideoBackends/Software/TextureEncoder.cpp | 10 +-- .../VideoBackends/Software/TextureEncoder.h | 2 +- .../VideoBackends/Software/TextureSampler.cpp | 9 +- .../VideoBackends/Software/TextureSampler.h | 2 +- .../VideoBackends/Software/TransformUnit.cpp | 18 ++-- Source/Core/VideoBackends/Software/Vec3.h | 7 +- .../VideoBackends/Software/VideoBackend.h | 2 +- .../Software/VideoConfigDialog.cpp | 8 +- .../Software/VideoConfigDialog.h | 8 +- .../VideoBackends/Software/XFMemLoader.cpp | 11 ++- .../Core/VideoBackends/Software/XFMemLoader.h | 2 +- Source/Core/VideoBackends/Software/stdafx.cpp | 2 +- Source/Core/VideoCommon/AVIDump.cpp | 12 +-- Source/Core/VideoCommon/AVIDump.h | 2 +- Source/Core/VideoCommon/BPFunctions.cpp | 20 +++-- Source/Core/VideoCommon/BPFunctions.h | 4 +- Source/Core/VideoCommon/BPMemory.cpp | 4 +- Source/Core/VideoCommon/BPMemory.h | 2 +- Source/Core/VideoCommon/BPStructs.cpp | 29 +++--- Source/Core/VideoCommon/BPStructs.h | 2 +- Source/Core/VideoCommon/CPMemory.cpp | 4 +- Source/Core/VideoCommon/CPMemory.h | 2 +- Source/Core/VideoCommon/CommandProcessor.h | 4 +- Source/Core/VideoCommon/DataReader.h | 2 +- Source/Core/VideoCommon/Debugger.cpp | 16 ++-- Source/Core/VideoCommon/DriverDetails.cpp | 4 +- Source/Core/VideoCommon/DriverDetails.h | 2 +- Source/Core/VideoCommon/EmuWindow.cpp | 15 ++-- Source/Core/VideoCommon/FPSCounter.cpp | 9 +- Source/Core/VideoCommon/Fifo.cpp | 26 +++--- Source/Core/VideoCommon/Fifo.h | 4 +- .../VideoCommon/FramebufferManagerBase.cpp | 7 +- .../Core/VideoCommon/FramebufferManagerBase.h | 2 +- Source/Core/VideoCommon/HiresTextures.cpp | 15 ++-- Source/Core/VideoCommon/HiresTextures.h | 4 +- Source/Core/VideoCommon/ImageWrite.cpp | 4 +- Source/Core/VideoCommon/ImageWrite.h | 2 +- Source/Core/VideoCommon/IndexGenerator.cpp | 6 +- Source/Core/VideoCommon/IndexGenerator.h | 2 +- Source/Core/VideoCommon/LightingShaderGen.h | 6 +- Source/Core/VideoCommon/LookUpTables.h | 2 +- Source/Core/VideoCommon/MainBase.cpp | 31 +++---- Source/Core/VideoCommon/MainBase.h | 2 +- Source/Core/VideoCommon/NativeVertexFormat.h | 2 +- Source/Core/VideoCommon/OnScreenDisplay.cpp | 17 ++-- Source/Core/VideoCommon/OpcodeDecoding.cpp | 36 ++++---- Source/Core/VideoCommon/PerfQueryBase.cpp | 4 +- Source/Core/VideoCommon/PerfQueryBase.h | 2 +- Source/Core/VideoCommon/PixelEngine.cpp | 25 +++--- Source/Core/VideoCommon/PixelEngine.h | 2 +- Source/Core/VideoCommon/PixelShaderGen.cpp | 14 +-- Source/Core/VideoCommon/PixelShaderGen.h | 8 +- .../Core/VideoCommon/PixelShaderManager.cpp | 13 +-- Source/Core/VideoCommon/PixelShaderManager.h | 8 +- Source/Core/VideoCommon/RenderBase.cpp | 45 +++++----- Source/Core/VideoCommon/RenderBase.h | 15 ++-- Source/Core/VideoCommon/ShaderGenCommon.h | 10 +-- Source/Core/VideoCommon/Statistics.cpp | 4 +- Source/Core/VideoCommon/Statistics.h | 5 +- Source/Core/VideoCommon/TextureCacheBase.cpp | 20 ++--- Source/Core/VideoCommon/TextureCacheBase.h | 10 +-- .../VideoCommon/TextureConversionShader.cpp | 15 ++-- .../VideoCommon/TextureConversionShader.h | 6 +- Source/Core/VideoCommon/TextureDecoder.h | 2 +- .../Core/VideoCommon/TextureDecoder_x64.cpp | 17 ++-- Source/Core/VideoCommon/VertexLoader.cpp | 44 ++++----- Source/Core/VideoCommon/VertexLoader.h | 10 +-- .../Core/VideoCommon/VertexLoaderManager.cpp | 12 +-- Source/Core/VideoCommon/VertexLoaderManager.h | 3 +- .../Core/VideoCommon/VertexLoader_Color.cpp | 13 +-- .../Core/VideoCommon/VertexLoader_Normal.cpp | 14 +-- Source/Core/VideoCommon/VertexLoader_Normal.h | 3 +- .../VideoCommon/VertexLoader_Position.cpp | 13 +-- .../VideoCommon/VertexLoader_TextCoord.cpp | 14 +-- .../Core/VideoCommon/VertexLoader_TextCoord.h | 2 +- Source/Core/VideoCommon/VertexManagerBase.cpp | 34 ++++--- Source/Core/VideoCommon/VertexManagerBase.h | 2 +- Source/Core/VideoCommon/VertexShaderGen.cpp | 17 ++-- Source/Core/VideoCommon/VertexShaderGen.h | 8 +- .../Core/VideoCommon/VertexShaderManager.cpp | 26 +++--- Source/Core/VideoCommon/VertexShaderManager.h | 4 +- Source/Core/VideoCommon/VideoBackendBase.cpp | 8 +- Source/Core/VideoCommon/VideoBackendBase.h | 4 +- Source/Core/VideoCommon/VideoCommon.h | 6 +- Source/Core/VideoCommon/VideoConfig.cpp | 20 +++-- Source/Core/VideoCommon/VideoConfig.h | 8 +- Source/Core/VideoCommon/VideoState.cpp | 23 +++-- Source/Core/VideoCommon/VideoState.h | 4 +- Source/Core/VideoCommon/XFMemory.cpp | 2 +- Source/Core/VideoCommon/XFMemory.h | 2 +- Source/Core/VideoCommon/XFStructs.cpp | 16 ++-- Source/Core/VideoCommon/XFStructs.h | 2 +- Source/Core/VideoCommon/stdafx.cpp | 2 +- Source/VSProps/Base.props | 3 +- 893 files changed, 4628 insertions(+), 4957 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp index 5a657a5fd80..4925d3aa52a 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 530108479c2..d2097cadb0a 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 4c84ae69e10..a88fae0b656 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 defa3c408a9..78a8576d5ee 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 7bb1e093f9a..4e387ba1df8 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/AudioCommon.h" +#include "AudioCommon/AOSoundStream.h" +#include "AudioCommon/AlsaSoundStream.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 f1aece0b9cf..054c0fe47e8 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 967eaa4b0a3..a46edbb6606 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 5ebbbb945c7..4df7c6000ef 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 399541c1c93..418239fae43 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 c5d2e3afb8b..76eb404665f 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 def27babb5a..b79cb0d1eb1 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 966b355dc00..15a7b4d7f16 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 ca9c5b7dd5f..2fb2d2961c9 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 99bf8aae4b7..fe41f495081 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/SystemTimers.h" +#include "Core/HW/AudioInterface.h" void NullSound::SoundLoop() { diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index bcc96a91510..4b971c97d3a 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 6e741e8e711..e8f950e5abb 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/OpenALStream.h" +#include "AudioCommon/DPL2Decoder.h" #if defined HAVE_OPENAL && HAVE_OPENAL diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 6653e33684e..1317a61f7af 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 ad6b3edece4..847fcdffaa6 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 a75aab59f9b..dcc94cd43b7 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 fe68d0eb6ca..647798c39f5 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 c9ccfb80fab..732772ace22 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 dd130e814a3..0e4736de4f3 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 f73b484fe74..776d0d6fa47 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 e96f64ab5dd..baa7b0434f3 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 4e9bade6186..117484ca802 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 d85aafc4f78..de38c8765ad 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 d03953fc577..3a98dc0e0ac 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 bbea6dd2db6..ce0806a5c9e 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 0cb33a8ad28..644e728bfef 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 7ea071d12ec..fabe4352338 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 b602b399250..0ec820a662e 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 0c9a8c6e649..65353ba3391 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 7bcd6e8f683..d35f7f6afad 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 836a1072b8a..837a931e4cd 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 7d2f9204e8c..88e38ed20ef 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 e250efbdca5..b6aef1a94cc 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 5e52b0a0eb3..2615d94c348 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 912afd7feee..326f4df661c 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 285e5cd9685..cecad0c62ae 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 37b5f281c57..156b758749a 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 19ca22df1a7..576922ea769 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 10ec036cad5..fe33d6cbaf3 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 b23da3a05b4..ffd44f3d964 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/Common.h" +#include "Common/ColorUtil.h" namespace ColorUtil { diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h index bf4979e7baa..042e55ddb8d 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 fc326e2cc87..44869720773 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -7,8 +7,8 @@ // DO NOT EVER INCLUDE directly _or indirectly_ from this file // since it slows down the build a lot. -#include -#include +#include +#include #include // SVN version number @@ -45,9 +45,9 @@ private: }; #endif -#include "Log.h" -#include "CommonTypes.h" -#include "MsgHandler.h" +#include "Common/Log.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #ifdef __APPLE__ // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. @@ -172,4 +172,4 @@ enum EMUSTATE_CHANGE EMUSTATE_CHANGE_STOP }; -#include "CommonFuncs.h" +#include "Common/CommonFuncs.h" diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 611e1a1641f..dba3a63bcba 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -13,7 +13,7 @@ #include #include -#include "Common.h" +#include "Common/Common.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 633afbd7553..dc05b92d565 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/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp index a0676df731b..e2a9dd6a4a5 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 e1eb617406a..727f5d828c4 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 379b2c4f03e..527b8609abc 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 759aaac37c7..e7b4884cb0f 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 9cae0f5f1d8..b6e237ada86 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 7597b914964..4cecb2bf837 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 02c2b2aec53..ca36bad966c 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -2,9 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include +#include -#include "CommonPaths.h" -#include "FileUtil.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" #ifdef _WIN32 #include @@ -29,9 +31,6 @@ #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 61dd618c1b5..1b49d4d2690 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 ab017347e89..df1010c4197 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 23a54cd47da..a27a1c7e925 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 6999c586938..7c4ec737e53 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 4d87b6bea86..c057b325b43 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 5103db96f0a..ce9312b0e4a 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -4,9 +4,10 @@ #pragma once -#include "Common.h" #include +#include "Common/Common.h" + // On disk format: //header{ // u32 'DCAC'; diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 45bcd53db4c..31a6d8c9cfd 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/Timer.h" +#include "Common/Thread.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 36b197cc3e3..ffd2e7efd5b 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 c92e659890f..5b3f870d9fa 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 ecb264cbec0..2cd1d8f3a6c 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 699005dd52e..4a7c30538c4 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 5cd952d23ae..59e62c00091 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 242fdbcb81d..e65f0a1cbb5 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 ce42deb4d2f..71a140c69b8 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 0fa1cf39b8b..bbfa10d2334 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 52e39045368..b4e89a5d603 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 f1fd1510073..cdaf1a7676c 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 5475cf131d3..16a9b13f4ce 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 "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 e684720987d..6f95b2c96b9 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 b368a7171aa..beeaa82da9d 100644 --- a/Source/Core/Common/SettingsHandler.cpp +++ b/Source/Core/Common/SettingsHandler.cpp @@ -4,9 +4,9 @@ // Thanks to Treeki for writing the original class - 29/01/2012 -#include "CommonPaths.h" -#include "Timer.h" -#include "SettingsHandler.h" +#include "Common/CommonPaths.h" +#include "Common/SettingsHandler.h" +#include "Common/Timer.h" #include diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h index c6bbab9e9b8..238e2d85eb9 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 68e1f187dce..2f537d19fc4 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 7d8825231e0..233bc8717b6 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 d44432837cb..31e20e360c3 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 e7a716de0f5..b44922ff6ec 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 348bdb5055b..2166531cc03 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 6948e7db31c..cb634b22b9c 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 1b4706e74a7..0594a9dda2b 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 740750a8ea5..ce52375c3dd 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 4eda7ae9ec3..dda363094ff 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -4,15 +4,15 @@ #pragma once -#include "StdConditionVariable.h" -#include "StdMutex.h" -#include "StdThread.h" - -// Don't include common.h here as it will break LogManager -#include "CommonTypes.h" -#include +#include #include +#include "Common/StdConditionVariable.h" +#include "Common/StdMutex.h" +#include "Common/StdThread.h" +// Don't include common.h here as it will break LogManager +#include "Common/CommonTypes.h" + // This may not be defined outside _WIN32 #ifndef _WIN32 #ifndef INFINITE diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 8faf502c900..d9299e7b493 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include +#include #include #ifdef _WIN32 @@ -13,8 +13,8 @@ #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 851f48b7a4e..6e0d6662993 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 09bfa9b1af3..76546f040fb 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "Common/Common.h" #include "scmrev.h" #ifdef _DEBUG diff --git a/Source/Core/Common/stdafx.cpp b/Source/Core/Common/stdafx.cpp index b602b399250..f75affca286 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/x64ABI.cpp b/Source/Core/Common/x64ABI.cpp index 6cced100848..ce7ce5d94d0 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 c08480c2b6f..75ca8fe1d71 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 eac178ff213..c8115dca757 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 110e50de28f..613aafad735 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 b9ed2b538ae..f9a51608e6a 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 76e235ebcdf..fa6c42cfb0d 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 b3ec34bf0c7..52db3c20a80 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 34438d12b2d..ae061cbebd8 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 37e50bb75eb..8a9c4c6e815 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 792518c0204..7c2e89844b3 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 6da6f66884b..411dbe00fde 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 36dd9db8f8d..84797857497 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 262c59fc538..0509db8f88e 100644 --- a/Source/Core/Core/ArmMemTools.cpp +++ b/Source/Core/Core/ArmMemTools.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 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include @@ -25,12 +12,12 @@ #include #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/PowerPC.h" +#include "Core/PowerPC/JitInterface.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 7691421623f..1cef73ada5c 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/VolumeCreator.h" +#include "DiscIO/NANDContentLoader.h" void CBoot::Load_FST(bool _bIsWii) { diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h index d7df3390e1f..f580e8a98a8 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 1059bf7c4f6..678ac06b228 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/EXI_DeviceIPL.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/CPU.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 58316576a5b..a641a9b947f 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 23214ff994f..e406875f8ad 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 725332685b9..5f4b41b27d8 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 ac950d5038d..99235c8e368 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 bfbeb91a3b6..21fc4188acf 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 7cf2fef9977..a789515af88 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 f4f0cca8700..56e9898bed5 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 "DiscIO/Volume.h" +#include "DiscIO/VolumeCreator.h" +#include "Common/CommonTypes.h" +#include "Common/CommonPaths.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 "VideoCommon/VideoBackendBase.h" namespace BootManager { diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 2af8570ed1e..2c001787dbb 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 "DiscIO/NANDContentLoader.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" SConfig* SConfig::m_Instance; diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index d8763ef6666..e349763e6b9 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 c097c9e673a..a40ca025452 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -7,59 +7,57 @@ #include "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 "DiscIO/FileMonitor.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 "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 "IPC_HLE/WII_IPC_HLE_Device_usb.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 "PowerPC/PowerPC.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" #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 "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 e24a7e7ac8d..9c60c1b461e 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -14,8 +14,8 @@ #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 8aee3eb5c8f..f5dd1f95653 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 "DiscIO/NANDContentLoader.h" +#include "DiscIO/VolumeCreator.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" + 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 ee3b11bd79d..fc8386b5bbd 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 9b4e87747fe..248ca85e15d 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 21d0e1c2a3f..29c425ac6cc 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 bd21086a9c3..dfad0e10a20 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 043451f21e1..919d815e35e 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 5af1db370d3..17121b5cbe9 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 e83540f6ade..6f07679a5af 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 f2f4e5b79dc..6cafd66561a 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 004cc884c37..ccfa9c97ceb 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 db171f31542..d3bf7fcdb57 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 1796a1bf56f..caaedf74cca 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 8411a07e72d..88c83089615 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 d0d842b7aa8..7ef31699912 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 9f8ffe7727c..1d6e60a8996 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 5eceeb257e8..a201027b6df 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/Thread.h" +#include "Common/MemoryUtil.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/DSPAnalyzer.h" +#include "Core/DSP/DSPAccelerator.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 3d16b0d9a60..331762ee2ba 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 d2631d26856..ad7f5abc15d 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/DSPInterpreter.h" +#include "Core/DSP/DSPIntCCUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/DSPIntCCUtil.h index 31e3bbf608f..f25b05ae61d 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 a628b9b4d1b..fd50e67b8ff 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 353a39ac84b..dbe1d07f0fa 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 b8c78184ea6..19ab6f7ad90 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 9b33cb6b33e..aaae6cd6232 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/DSPInterpreter.cpp @@ -23,12 +23,12 @@ ====================================================================*/ -#include "DSPTables.h" -#include "DSPCore.h" -#include "DSPAnalyzer.h" +#include "Core/DSP/DSPAnalyzer.h" +#include "Core/DSP/DSPCore.h" +#include "Core/DSP/DSPHWInterface.h" +#include "Core/DSP/DSPTables.h" -#include "DSPHWInterface.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/DSPInterpreter.h index 6ceb077ef01..641ef05d26c 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 9bd5b19acc9..4120acbf612 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 7f7296b1a85..f37f29981dd 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 0bdff3be507..40b50f860c7 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 2ffcd080776..db228e5f672 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 20d27d468e2..bef2df15074 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/DSPInterpreter.h" +#include "Core/DSP/DSPIntExtOps.h" +#include "Core/DSP/DSPEmitter.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 80a479a2ef5..49e3ac9947c 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 6420dd4b0be..f7a82f648a8 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/DSPInterpreter.h" +#include "Core/DSP/DSPIntCCUtil.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 ecd1314e108..78cf972674c 100644 --- a/Source/Core/Core/DSP/DspIntBranch.cpp +++ b/Source/Core/Core/DSP/DspIntBranch.cpp @@ -4,13 +4,13 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#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" -#include "DSPIntCCUtil.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPIntUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntLoadStore.cpp b/Source/Core/Core/DSP/DspIntLoadStore.cpp index 0b72b212909..b676479c5e6 100644 --- a/Source/Core/Core/DSP/DspIntLoadStore.cpp +++ b/Source/Core/Core/DSP/DspIntLoadStore.cpp @@ -4,10 +4,10 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "DSPInterpreter.h" +#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPMemoryMap.h" -#include "DSPMemoryMap.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntUtil.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntMisc.cpp b/Source/Core/Core/DSP/DspIntMisc.cpp index aec554d7fb6..f03e4b9a28a 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 a1380879e8c..514b87f5373 100644 --- a/Source/Core/Core/DSP/DspIntMultiplier.cpp +++ b/Source/Core/Core/DSP/DspIntMultiplier.cpp @@ -7,10 +7,10 @@ // Multiplier and product register control -#include "DSPInterpreter.h" +#include "Core/DSP/DSPInterpreter.h" -#include "DSPIntCCUtil.h" -#include "DSPIntUtil.h" +#include "Core/DSP/DSPIntCCUtil.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 5e2dfe7c14a..f39057c1a67 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 49c94114b2d..d8eb87f4997 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 62540ffe4fc..fdaa67b3a56 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 f18bc3de847..5ffa4081b40 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 765ecb39e48..b842111f740 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 6da5b646f4b..646339ff834 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 00cec82e768..234226aab35 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 6950daa6d15..9f351f92647 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 c2e27a359cc..96039646605 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 dd7e042169a..f32d0e51757 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 1c836e7a69a..57931a76db6 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 c0a822de810..6875b556cd1 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 9924c576be4..eecfc060c54 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 1412faf6b13..2011fa783bb 100644 --- a/Source/Core/Core/DSP/assemble.h +++ b/Source/Core/Core/DSP/assemble.h @@ -27,10 +27,11 @@ #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 af0eb91c293..462b480126f 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 1e3af70d3c9..855ee9af357 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 52cae0d4926..65e63ea926c 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/DSPLLE/DSPLLE.h" +#include "Core/HW/DSPHLE/DSPHLE.h" DSPEmulator *CreateDSPEmulator(bool HLE) { diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h index caf90b00326..71a12635e8c 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 3aa9294ef20..882284c5a98 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 acf92f42432..d01db6d6056 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -7,7 +7,7 @@ #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 bdd4f152d77..a4c23ab07d3 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 70b6286aea4..71c987f5e3a 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 0fb1363f9c6..ce2ba27b23e 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/JitCommon/JitBase.h" +#include "Core/PowerPC/PPCSymbolDB.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 7b16f6bb77d..a55de88a8fc 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 e73ed3d891b..3fd73f288db 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_Position.h" +#include "VideoCommon/VertexLoader_Normal.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 a4c696f7d78..7953cf61f5e 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 5e7e864ad0e..d4b66342a98 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 6d35ea094fb..f1d4ace8c31 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 daa4f41f809..928a2d5bfc3 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 81a647286c7..e389f773113 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 0db01cea82e..fd85274ebd2 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 070f4792e3f..55731f3162a 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 c6e3318d23d..3ed25474327 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 d628e9bfbf6..7e16ddb3de8 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 06edc81114c..bc9a27b8709 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 e58b34658a4..7207812044e 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 4cee4191e40..2b7bc0dfb2a 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 54a92fa6d34..310704a79af 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 47f59fe1ee8..d91e3212d23 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 b4345612300..6d41d2b3fa5 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 28786500096..6131dacaee1 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 986716990a1..1787246f70f 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_OS.h" +#include "Core/HLE/HLE_Misc.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 6deea0117ec..f320ff3023a 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 9b8754daf72..3bfb88201ea 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/SignatureDB.h" +#include "Core/PowerPC/PPCSymbolDB.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 ed026721101..d4bf99820cb 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 c55f27f4568..f0d0af28153 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 1de543470b6..1512dba200e 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 e79d1c3fc7d..404f14dec39 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 5309d9fc6a3..6d658121f27 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 1140ef72e01..c81659eeed9 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 c547038c884..4d8fc3c709a 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/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index dc81955f134..5a2869425e7 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 bba52b6bfcf..cbdfa91dfa3 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 76aa433b760..fe14e1e19be 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 5d6b1925387..2a9475a2108 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 501bc2a0dd8..39a80ace47e 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/HLEMixer.h" +#include "Core/HW/DSPHLE/DSPHLE.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 a5c784cb791..3a8df834a66 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 3b4e53c7356..d1d51c4c852 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 1e5c21d93e1..135bfe97b87 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 bcbc6961861..7ce13142abe 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 94a98f8bfab..21b3747e612 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 45a8d55c89f..7dd4f19baf7 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 53c9328dc46..ede8ef6aa3d 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 573fb6e8349..5a8162e452c 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -2,18 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#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" +#include "Core/HW/DSPHLE/UCodes/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h" #define AX_WII -#include "UCode_AX_Voice.h" +#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.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 a9fe80b46f1..fcee1ea1392 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 575481b3fbe..3253e94fbdc 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,13 @@ #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/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 bb0d8585480..2ff25c78c4b 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_CARD.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 64031a104ce..5743e5f0fa0 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 6490dd9c668..f61070245de 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_GBA.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 61e68a916b7..db0e9a76714 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 1d54f7075ce..24bc2029e18 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.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 6d18114b288..1515f09cb9b 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 2b63bcf29c4..d6e12f9087f 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_ROM.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 51d5fec8666..96983e7bc5c 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 0490206842b..a33b546d67f 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.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 11227d4c676..eab6de743f4 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 2f9d03e9b05..5c28a7ff412 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 261ff64d8e7..2f90d967bf6 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.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 bf9a0cd3f78..ccc029891ea 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/UCodes.h" +#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.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 403d95c1b64..82f9e3bb35f 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/UCodes.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" 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 f4626741566..2413c08e58e 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/Common.h" +#include "Common/ChunkFile.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 9343fa70895..a6dd80ae1b5 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 1eca065104b..608bd3c5e19 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 5b2dc1f56e2..bfeae3f45ba 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -2,17 +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 "Common/Common.h" +#include "Common/Hash.h" + +#include "Core/Host.h" +#include "Core/ConfigManager.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/DSPSymbols.h" +#include "Core/HW/DSPLLE/DSPLLETools.h" +#include "Core/PowerPC/PowerPC.h" + #include "OnScreenDisplay.h" // The user of the DSPCore library must supply a few functions so that the diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index af747815d12..b891bec5033 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/DSPInterpreter.h" +#include "Core/DSP/DSPHWInterface.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 7197d8f69ed..adb332661d0 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 c879f5604b1..d41db0a0bac 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 7d21a3d1ecb..eb903db115d 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 d0f50834a26..1d9c0e8d4fa 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 90beaed7962..0933635eee7 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 1939731796e..acf646b9f40 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 884b5c39414..b69efec1453 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 ede1dc6bdce..2eaf3b2ffc2 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 dfa0b9da102..b4048c76f4d 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/Common.h" +#include "Common/ChunkFile.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 f35ed1a1919..7e0d2df0fc2 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 ae91ebe2cd4..a62a5b815b3 100644 --- a/Source/Core/Core/HW/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI_Channel.cpp @@ -2,12 +2,12 @@ // 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/Movie.h" +#include "Core/HW/EXI.h" +#include "Core/HW/EXI_Channel.h" +#include "Core/HW/EXI_Device.h" +#include "Core/HW/MMIO.h" #define EXI_READ 0 #define EXI_WRITE 1 diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h index aedc09c3eae..443b9202ac5 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 e2e4924d388..e19ceabf42d 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/Core.h" +#include "Core/ConfigManager.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 f83f45d8d41..69a7761075c 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 e4806b87dae..6726c31c885 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 03de8304f26..9975d148ded 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 e780c8d6e78..d80f2bb886f 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 803e6f0ac95..182f6c28b3c 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 594c9c674ac..2938d85cd4f 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 9de1801f79b..4a24c4d9bd2 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 716b04969ba..d0409bd9928 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 2d0759f3eee..d127977547a 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 fbf492e4d2d..1b638b2d04f 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 070c519742c..47f5ff40ded 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 863463f41c2..4d4268fd982 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 3ae9d601587..00cda0f20e1 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 ec05e5043cb..99fcd86c191 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 08ca5cef4b5..37a601daa28 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 1ba87e311c5..4c3b1aa2103 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/ControllerInterface/ControllerInterface.h" +#include "InputCommon/InputConfig.h" -#include "../../InputCommon/InputConfig.h" namespace Pad { diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h index e687208b4ea..ee03c3cd51b 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 39d2ea29c5b..ad24815916b 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 4fe96a66629..150ef15a272 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 88371a68d9b..1aafdf36cbc 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/JitCommon/JitBase.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" namespace GPFifo { diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 3a895a7bf8d..6871d95186c 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 63f934588ad..acc78f1c0fd 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 3ce3bab3209..684d25c5951 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/Common.h" +#include "Common/ChunkFile.h" namespace HW { diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index 759823f4804..2f8788b2142 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 35f83d8b99e..541d75b271c 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 732704efaee..b0f41a4feff 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 2d0568521d2..fff29ad8021 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/Core.h" +#include "Core/ConfigManager.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/MemoryInterface.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/MMIO.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/SI.h" +#include "Core/HW/WII_IPC.h" +#include "Core/HW/VideoInterface.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 77599fbf3d5..85c2a363d4a 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 6168d91bc38..3a85a1ed708 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 ed38f07d64e..e3fae0cb7e8 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 436d8222076..3d4891f972d 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 7b8e4778b06..52547fd7453 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 c0c4507496e..e2fe43c3903 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 f3ec409d04e..6c7d98387d0 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 1af21c6ed8d..4d14f7603ce 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 ee0e649b5e9..01a173b658d 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 a0912988e11..5c819dccc20 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 96d3fba56cd..49f3f6078e9 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/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 "Core/HW/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 20dbd3ff612..40405b60e34 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 6fd73c3c64a..2185d84775b 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 754c17d376e..0e83744f6f7 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SI_Device.h" -#include "SI_DeviceGBA.h" +#include #include "SFML/Network.hpp" -#include "Thread.h" -#include + +#include "Common/Thread.h" + +#include "Core/HW/SI_Device.h" +#include "Core/HW/SI_DeviceGBA.h" 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 a6ddab1f03a..09129f9fe6d 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 e5b1405fc4f..9c0082266b9 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 33937dccca5..3eb43083dce 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 2a677288ba0..78757d20d0b 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 368d2b3a971..e1368be08da 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 9a84212c3c8..da71b62b0e2 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 4dc910948d6..e0412670df6 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 5a1f836d9dd..14384b073ea 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 27683d12140..d6fe5e69a39 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/CoreTiming.h" +#include "Core/ConfigManager.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/PowerPC/PowerPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE.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 ff7e59f530e..d4b2073ac32 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 66f0d70517a..d4807fc7f14 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 dc4a3c248c4..ff4a5c2b10b 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 04bd936d430..93ff9bbade0 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 ce7119eb4c9..7cb578b31b4 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 5efd075e0d6..94a359af500 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/ControllerInterface/ControllerInterface.h" +#include "InputCommon/InputConfig.h" namespace Wiimote { diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 66541a6e9ca..2a996033249 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 dbb718d211d..cb7faafdc7a 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 ba49885c863..01b783603b2 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 efa4b4a3b78..915d051c948 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 edcd57c8770..6094ecbe6d2 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 7a4b2dbeb5f..35a1fe8e875 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 1228a98e817..8c2bbc17bce 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 dd333094818..51c3224e310 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 3ab4fae65f6..379096c11ee 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 89c8d09ecc2..6f57548f451 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/UDPWrapper.h" +#include "InputCommon/UDPWiimote.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h index beb65949ce7..83a7540c462 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 39a0f8ddaa3..650d5b67200 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 8275961eb49..48b3658ce17 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 ede4e67f4bb..255833e57f2 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/WiimoteReal/WiimoteReal.h" +#include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp index 3c0c111a905..8d2efd0fb80 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 d7eeaf8c8db..fce9d975442 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 fdf3af93580..1a9e3c7b177 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 8e9ac254ea0..7a827d48a50 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 ae506a1bce8..efe5274b03f 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/Host.h" +#include "Core/ConfigManager.h" +#include "Core/Movie.h" +#include "Core/NetPlayClient.h" -#include "../WiimoteReal/WiimoteReal.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 "Timer.h" -#include "Common.h" -#include "../../Host.h" -#include "../../ConfigManager.h" - -#include "UDPTLayer.h" +#include "Core/HW/WiimoteEmu/MatrixMath.h" +#include "Core/HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/HW/WiimoteEmu/UDPTLayer.h" +#include "Core/HW/WiimoteReal/WiimoteReal.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 8b24fcfac5b..49714cb6bba 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -4,17 +4,18 @@ #pragma once -#include "../../Core.h" - -#include "ControllerEmu.h" -#include "ChunkFile.h" - -#include "WiimoteHid.h" -#include "Encryption.h" -#include "UDPWrapper.h" - -#include #include +#include + +#include "Core/Core.h" + +#include "Common/ChunkFile.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 e25edfc6cf3..9befb27634f 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 57034ff09af..f410a04394e 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 0f4fe5e7307..4684aee61a2 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 e08e160f61c..e9244287896 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -2,20 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include #include -#include +#include +#include #include +#include #include #include #include #include -#include "Common.h" -#include "WiimoteReal.h" -#include "StringUtil.h" +#include "Common/Common.h" +#include "Common/StringUtil.h" + +#include "Core/HW/WiimoteReal/WiimoteReal.h" // Used for pair up #undef NTDDI_VERSION diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index c094c97c13c..8ac433a095f 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 e5f7fe8724a..99db68ba4de 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -2,22 +2,21 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include -#include +#include +#include -#include "Common.h" -#include "IniFile.h" -#include "StringUtil.h" -#include "Timer.h" -#include "Host.h" -#include "ConfigManager.h" #include "SFML/Network.hpp" +#include "Common/Common.h" +#include "Common/IniFile.h" +#include "Common/StringUtil.h" +#include "Common/Timer.h" -#include "WiimoteReal.h" - -#include "../WiimoteEmu/WiimoteHid.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" +#include "Core/HW/WiimoteEmu/WiimoteHid.h" unsigned int g_wiimote_sources[MAX_BBMOTES]; diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 72db5a6d611..d84dc9da583 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 de7e9294faa..2b3b49bb23d 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 b1d3f5da979..07610673ea4 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 1029a39ecb1..a26ebfc00ea 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -21,38 +21,40 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC */ #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" // For Copy +#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 20528b11429..2bd3983f9da 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 d47e2972f49..d5888e9295a 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 17009fb33d7..3b6f19a2830 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 fb9b466a4a5..0d8b6f2adf2 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 82f3fdaec4a..3a6d3283df1 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 0b7ac92d8b1..93bfe976044 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 ecb4f0eb299..ebeb0cf531f 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,26 @@ */ // ============= -#include "WII_IPC_HLE_Device_es.h" +#include "Core/IPC_HLE/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/Movie.h" +#include "Core/VolumeHandler.h" +#include "Core/Boot/Boot_DOL.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/ec_wii.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 2dd22dfc58f..8f4d198f98c 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 e4a690ceae1..fbc213c80fa 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 05c6569b52d..f8c7c9661b4 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 4a880a95da4..64958bcc954 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 a33459244a1..89fb6c85b86 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,14 @@ #pragma once -#include "WII_IPC_HLE.h" -#include "WII_IPC_HLE_Device.h" -#include -#include "Thread.h" #include +#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 8458103908a..9318e10d6fe 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,26 @@ // 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 "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)) 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 67e731d0474..4c2f112904b 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 65673f86c92..ba92259cb13 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 25b1abdef0e..6b8f2241400 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,12 +4,12 @@ #pragma once -#include "WII_IPC_HLE_Device.h" - #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 07ceef30e42..985927aa205 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/Core.h" +#include "Core/ConfigManager.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 6987fdf4652..b237c67fd59 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 b97bf419219..10b5ef5d6e3 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 95f409a92bd..22e18386baa 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/Wiimote.h" +#include "Core/HW/WII_IPC.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 6798f5d9a5d..0cdcea95755 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 978cd2313a0..a50a47cfbce 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 07f6d377746..da50bc3cb6b 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,18 @@ // 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/WII_IPC_HLE_Device_usb.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" +#include "Core/IPC_HLE/WiiMote_HID_Attr.h" + +#include "Core/IPC_HLE/l2cap.h" // Local 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 18c18697582..afa78d75e3c 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 4a4527ea4b8..d036a88c3df 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 153ebc3b205..cb0a9db37c0 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 57e60e8899b..00cc60b7a27 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 7dc7e20600a..276af3d8879 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 019d2b0a63e..242ac4e9334 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 "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 912b8cb6330..d8709d53597 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -4,13 +4,13 @@ #pragma once -#include "Common.h" -#include "../InputCommon/GCPadStatus.h" +#include "Common/ChunkFile.h" +#include "Common/Common.h" + +#include "InputCommon/GCPadStatus.h" #include -#include "ChunkFile.h" - namespace WiimoteEmu { struct ReportFeatures; diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 8b4f6330ec3..a77c7f5dd94 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -2,24 +2,24 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NetPlayClient.h" +#include "Core/NetPlayClient.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" +#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 gcpad -#include "HW/SI.h" -#include "HW/SI_DeviceGCController.h" -#include "HW/SI_DeviceGCSteeringWheel.h" -#include "HW/SI_DeviceDanceMat.h" +#include "Core/HW/SI.h" +#include "Core/HW/SI_DeviceDanceMat.h" +#include "Core/HW/SI_DeviceGCController.h" +#include "Core/HW/SI_DeviceGCSteeringWheel.h" // for gctime -#include "HW/EXI_DeviceIPL.h" +#include "Core/HW/EXI_DeviceIPL.h" // for wiimote/ OSD messages -#include "Core.h" -#include "ConfigManager.h" -#include "Movie.h" -#include "HW/WiimoteEmu/WiimoteEmu.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" +#include "Core/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 4ea30dd7605..81562dea4d9 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 a0a650e8a38..14eb998f683 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 fa9e11b8ba8..f02b3c0a2b6 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 0ed10d4f558..ff815656538 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 d01ed5a4007..8c14111beb8 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -20,15 +20,16 @@ #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 e347a0758c2..b601e41d39e 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 3b1fd3d8637..06d40a1086b 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -1,23 +1,10 @@ -// 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 "Core/PowerPC/GDBStub.h" #include #include diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h index c96b48f3b78..b7d96366595 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 7fd0295b3b2..e14a10bcf21 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 dd71abcaebe..1eb74300bf7 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 f9f252d4ecd..0e58f987766 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 5a3dc9e467a..b64ee65c71b 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 d2c5c23c5ae..48e5cc8523b 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 9056c6f7174..3b514966639 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 4fd420b234f..5b32d50fe08 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 3fb441f5b94..514a9a4a807 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.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 "Interpreter.h" -#include "Interpreter_FPUtils.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" +#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" -#include "../JitInterface.h" +#include "Core/PowerPC/JitInterface.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 05a209ba2ae..857e0ef7e89 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 601bdb05233..ce99a5cfe93 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 60c1410d42d..db278e262f2 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 ec50040f57f..81961682daa 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 fe960678406..6e49b36b464 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 2186bf87844..cee8fc2c831 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/JitAsm.h" +#include "Core/PowerPC/Jit64/JitRegCache.h" +#include "Core/PowerPC/Jit64/Jit64_Tables.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 4f00aac342f..1387fd546e7 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/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "Core/PowerPC/JitCommon/Jit_Util.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 47b20ec4de8..add12a60ef2 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 4a45405a9fb..c963ac1f7ba 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 56975ef6eac..667a6d08161 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 4399663f806..f2475ee0360 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 6e4815ec0dd..73017b5ebdc 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 db9c3776334..c27f46680a9 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 36cf0118738..aa07251c7d7 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 9607e9a0c4d..389c29ca072 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 177708bf009..812c2033095 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 1b41c2f1e93..7c5078a816b 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 b99d04e52c1..5429cc7075a 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 4ebe5830047..d2557d3d1ba 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 781b75a5380..1af82d26b5e 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 690d3d8ca89..9bfefabd2f5 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 60ef5290ca9..dca36196bf5 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 bd4a38fdcbb..c3ed548a892 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -2,17 +2,17 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #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/JitILAsm.h" +#include "Core/PowerPC/Jit64IL/JitIL_Tables.h" using namespace Gen; using namespace PowerPC; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h index fab95f4687c..9ed2a354a37 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/Memmap.h" +#include "Core/HW/GPFifo.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/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitILCommon/JitILBase.h" +#include "Core/PowerPC/JitILCommon/IR.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 a909d32725b..cb28dd42c56 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 "Core/PowerPC/Jit64IL/JitIL.h" +#include "Core/PowerPC/Jit64IL/JitILAsm.h" -#include "MemoryUtil.h" -#include "CPUDetect.h" +#include "Common/CPUDetect.h" +#include "Common/MemoryUtil.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h index 6af6b441f94..a465df88e2e 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 0ed40947f6e..39fce69247e 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 7225bf8abc3..c1150ae23b6 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 6b8e76eb9d9..cb62c023e0f 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -1,38 +1,25 @@ -// 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/Common.h" +#include "Common/ArmEmitter.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/CoreTiming.h" +#include "Core/PatchEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/PowerPC/JitInterface.h" +#include "Core/PowerPC/PPCAnalyst.h" +#include "Core/PowerPC/PPCTables.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/HW/GPFifo.h" +#include "Core/HW/Memmap.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 0e9e8fe3b2e..505f649a5da 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 82956364def..2fdd1951405 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 8f0cc4997be..cd41399dba8 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 79fb88a7d55..4be36390ebb 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 6d8ed810974..4e535d2cd34 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 41b794aea59..265ba2deb65 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 28e9723333c..16d13a69415 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -1,35 +1,23 @@ -// 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" +#include "Core/PowerPC/JitArm32/JitArm_FPUtils.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 "JitArm_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/JitArm_FPUtils.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 21d653d31b5..525903bfc95 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 3983772aa6d..d8de044e92f 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 96c7fd4bcc9..62389aad102 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 244ae1db227..e11e22f065a 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 53d5e7bd8dc..f4ec4930c0f 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 bc0ded7d538..e1a8c55d92f 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 a999f449d27..661cc6abf04 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 c858d771f67..69b5fda995f 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 33a2a1a70ff..8cec544b9d3 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 a7cabda1dc5..061a2bac39c 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 7247ddbd1eb..8f44a9c81fb 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 807e200cdbf..1e2f1acfa71 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 f1e678e9713..c5f97d43a85 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 6271f58116b..e1097e9a635 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 c1bee507fc4..d563ad86629 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 79fde162248..00c51eca19a 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/Common.h" +#include "Common/ArmEmitter.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 416dfaf3ac0..20de0661c6c 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 2cb9e298f26..ab2c92db9ac 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/JitCommon/JitCache.h" +#include "Core/PowerPC/JitArmIL/JitIL.h" +#include "Core/PowerPC/JitArmIL/JitILAsm.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 884baf20e46..ef95b6db07b 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 bad63dd5c60..65c0297d83f 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 eaa59516843..970898909d5 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 8e6e0bcd25b..7d92e6cf0bb 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 db773234014..a448aac6a79 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 a25df9889ec..5d6e92a0784 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 828d8a6a31c..79469a5f792 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/JitBase.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" + #ifdef _WIN32 #include #endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h index 1d6a031b242..38f142bed31 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/x64Emitter.h" +#include "Common/x64Analyzer.h" // meh. #if defined(_WIN32) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp index d135e9864cd..dc49c89b520 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 a2625eb5fb9..55e5fe67981 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/JitAsmCommon.h" +#include "Core/PowerPC/JitCommon/JitBackpatch.h" // for EmuCodeBlock +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "Core/PowerPC/JitCommon/Jit_Util.h" // for EmuCodeBlock + // 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 8fb7bd471b4..d34bdc90b16 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 143d62ea896..c9621bc689c 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 cd739acc8c4..7475f4431cc 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/JitBase.h" +#include "Core/PowerPC/JitCommon/Jit_Util.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 278b9d73529..67466843add 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 745b547a05f..5470a6eaa0d 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 bf0822f85f3..d15b379f1cb 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 1bc3d25f5fe..24ac61b9305 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 6d6c594126f..7a6fd163907 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 893bafe0d0b..afa028244c3 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 836cc9d45ee..97eb67498f7 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 adbf31439a6..67a140c2e61 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 986489cd3f4..2e4a50cd697 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 cd2b17f7584..6cc5e02b4dd 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 7ed65497c70..15cd6a2ef6f 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 93c635839cc..f171b63091d 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 91d43a77920..54a82d92458 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -9,27 +9,27 @@ #include #endif -#include "JitInterface.h" -#include "JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitInterface.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" +#include "Core/ConfigManager.h" +#include "Core/HW/Memmap.h" +#include "Core/PowerPC/Profiler.h" +#include "Core/PowerPC/PPCSymbolDB.h" bool bFakeVMEM = false; bool bMMU = false; diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index 2b6b9706312..51fa746fa22 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 89aaf33eb25..4f11bcfc2f9 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 b1fddf05146..00925de1312 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 21b192f5141..9f898f57ca2 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 0785e379434..976435ef5ff 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/PPCCache.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/JitCommon/JitCache.h" +#include "Core/PowerPC/JitInterface.h" namespace PowerPC { diff --git a/Source/Core/Core/PowerPC/PPCCache.h b/Source/Core/Core/PowerPC/PPCCache.h index b38692d7282..de4b2cacae6 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 eb5b65a49e1..cb8f0f0775f 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 fc732575c24..b40ef70050b 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 bda18339d50..264fe5f4e37 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 b54260f3cdc..82fcc9e8cab 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 00ecfaf443c..bf035845160 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 745181c8af8..12295cf2cb3 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 77da606e52e..59a7535d3a9 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 82474fc03f2..1d21ddc5387 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 4d0e451d180..9d1029b61b1 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 bc1069abc39..3d8f3d5c0c7 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/Core.h" +#include "Core/ConfigManager.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 a57d40b0065..787b66f58dd 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 5ceba836e54..d1c8d4cb96e 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 ca47074bb09..2a6e8f9b909 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 f512d827eb2..bb858a987bd 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 "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 56d09ae0b46..b99511432e4 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 a5ed163df70..5c65695aed4 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 11f9697ba9f..d0c59c567df 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 0d341931e03..d291f7fb6c5 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 ce35258148f..960cf70a408 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/CommonTypes.h" +#include "Common/ColorUtil.h" +#include "DiscIO/BannerLoaderGC.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/BannerLoaderGC.h b/Source/Core/DiscIO/BannerLoaderGC.h index 5242600525a..d4d26d89743 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 15c43257480..d530cfbf65a 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/CommonTypes.h" +#include "Common/ColorUtil.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 bfc8f7c9759..45cbb136ce0 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 600b9e0a4bc..f8a831d95b0 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 5fdfe26e0e2..c93d47c9841 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 5070c8e7965..4bf97aed2f1 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 5cd016683a5..26f2a84ffd4 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 ac3050fd6f0..7e58c150927 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -11,10 +11,10 @@ #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" diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h index 2d201deae66..a170239e4b4 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 a992d23a3a2..b1274987cc3 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 c1efacb8c11..5b29fda9b70 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 017cd702bca..ad0a72a194e 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 5f4a70a6faf..1e708597022 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 42ea73c78d3..d97a4b1d7c6 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 21778a06055..cafa07412e9 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 26ec6ec9ec7..8e820e65b28 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 93f5bded1c3..23ff978b352 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 ae2f9c0f99b..bae2f499646 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 2b3559766b2..2ce4af3a531 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 c8d5c2b1989..078fb554cca 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 af8040dc3d8..74447112935 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 cdf6288a54c..fc07bae1ac0 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 10b85e2635a..b67f0d447ed 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 5f2f9af19ed..cd8e7c98c60 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/MathUtil.h" +#include "Common/Log.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 fa517cae64b..bff92974e5a 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 92112be609e..5343a9f1fda 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 ad5a226ef7c..af367c790ff 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 4a47d79b72e..74d4a5d99af 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 a92ec2ef8ee..a9f1e43da24 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 6f8141af130..eeaa5fe3664 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 c6a387b6862..4f9a47ff9c7 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 f2d97462e9a..8039d56922d 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 0ace9eaaa7f..42b7524269a 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 cc50ec8c669..d436c9935ad 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 892b2c0fbfb..7ae00685241 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 c6666ca029f..69b78690e9b 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 04401778d74..51033b1e5ec 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 50b3c789183..a13e2681233 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 0ac4ecf8458..83ac436dddc 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 783ede511d4..09c98085887 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -6,10 +6,11 @@ #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/WiiWad.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h index cde73495e20..b72f616149f 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 89b047311e3..8ab4b84b8fc 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 fd6b9add775..0143e153fe9 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 e6213086135..93578941a84 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/ARCodeAddEdit.h @@ -6,7 +6,7 @@ #include #include -#include "ISOProperties.h" +#include "DolphinWX/ISOProperties.h" class CARCodeAddEdit : public wxDialog { diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index d1971855eaa..c17c219b111 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/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 257237252f5..a8ebafdd208 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 07b3bfffbd0..f56157d7d12 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 a1ed7c6fe58..75c3de57436 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -2,17 +2,20 @@ // 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/Core.h" +#include "Core/ConfigManager.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 a4a654d601e..c8acbbd4b23 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -20,12 +20,10 @@ #include #include -#include "ActionReplay.h" - -#include "GeckoCodeDiag.h" - -#include "Filesystem.h" -#include "IniFile.h" +#include "Core/ActionReplay.h" +#include "Common/IniFile.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 4bf477d4fe3..62e41de79d6 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 93c545d87aa..8d2c96ddce4 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -9,9 +9,9 @@ #include #include #include -#include "ConfigManager.h" +#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 64348e3cd49..0e579924807 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/Debugger/BreakpointDlg.h" +#include "DolphinWX/Debugger/BreakpointWindow.h" +#include "DolphinWX/WxUtils.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 c23412e7ad0..8bd12e11100 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/PPCSymbolDB.h" +#include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/Debugger/BreakpointView.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" +#include "DolphinWX/WxUtils.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 564760fd16a..e53eacd20a9 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 a83db3abe08..8afc73fab06 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/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index b4d6c4378dd..9dc52374617 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 18bed46557c..8d41e5eb3e2 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 1720dcb887b..83bcce660f7 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/Core.h" +#include "Core/Host.h" +#include "Core/Boot/Boot.h" +#include "Core/ConfigManager.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/Debugger/Debugger_SymbolMap.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/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 "DolphinWX/WxUtils.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" + #include "DolphinWX/resources/toolbar_add_breakpoint.c" } // ------- diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 5ab2c902581..1dd52871b4d 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 14a1e3e1e89..c7c68458e37 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/HLE/HLE.h" +#include "Core/Boot/Boot.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/Debugger/Debugger_SymbolMap.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 3a120cacb80..6dcb0e4e1c3 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -2,20 +2,20 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" #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 3f71321fb04..df516061960 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -5,26 +5,26 @@ #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 "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 b3ad7dde8a6..8adbb32222a 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 d37ca2e6d17..bc28c6ccfb4 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 3cc55746fd4..a9be1e52905 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -6,7 +6,8 @@ #include #include -#include "Debugger.h" + +#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 db14859ff01..406d23910e1 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 cb3c263660f..3e46e98d161 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -3,29 +3,28 @@ // Refer to the license.txt file included. #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 "PowerPCDisasm.h" // Bochs +#include "disasm.h" // Bochs -#include "Debugger/PPCDebugInterface.h" -#include "Debugger/Debugger_SymbolMap.h" +#include "Common/LogManager.h" +#include "Common/StringUtil.h" -#include "Core.h" -#include "StringUtil.h" -#include "LogManager.h" -#include "../WxUtils.h" +#include "Core/Core.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/Debugger/Debugger_SymbolMap.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 "../Globals.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 e91f7d7893f..6eb0869284b 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 821ca30af22..f8ed8ba5d22 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 56a5c4c493e..9b09b1becd6 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -2,18 +2,17 @@ // 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 "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 { IDM_GOTOINMEMVIEW = 12000, diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h index b6fcc2fae61..b018669295d 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 6c351b77a58..ac66e0d62a7 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -8,23 +8,20 @@ #include #include -#include "../WxUtils.h" -#include "MemoryWindow.h" -#include "HW/CPU.h" -#include "PowerPC/PowerPC.h" -#include "FileUtil.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Core/Core.h" +#include "Core/ConfigManager.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 "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 "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 9cd74399c86..2da01361e17 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -7,11 +7,11 @@ #include #include #include -#include "MemoryView.h" -#include "Thread.h" -#include "StringUtil.h" -#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 310b6077c5c..b2045c82f19 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 9cb046bd4e9..6bcd46a36fe 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 c8cb9d14336..c18d207f8dd 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 cf8d7baad68..67281abbc06 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -2,21 +2,21 @@ // 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 "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" #include #include -#include -#include - DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index c86d035a1f0..194699b024f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,37 +10,37 @@ // 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" +#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 "DolphinWX/CheatsWindow.h" +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" -#include "VideoBackendBase.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 // 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" // Dolphin icon }; diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index b00a82d8d2b..33af0f11ca7 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -4,28 +4,31 @@ #pragma once -#include // wxWidgets +#include +#include + +#include #include #include #include #include #include #include -#include -#include #ifdef __APPLE__ #include #endif -#include "CDUtils.h" -#include "Debugger/CodeWindow.h" -#include "LogWindow.h" -#include "LogConfigWindow.h" -#include "TASInputDlg.h" -#include "Movie.h" +#include "Common/CDUtils.h" +#include "Core/Movie.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/TASInputDlg.h" +#include "DolphinWX/Debugger/CodeWindow.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 1cc9445a0eb..ccba858a334 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 b54524f2a6f..a6b71a6b360 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -14,52 +14,52 @@ 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 + +#include "Common/Common.h" +#include "Common/FileSearch.h" +#include "Common/FileUtil.h" +#include "Common/Timer.h" +#include "VideoCommon/VideoBackendBase.h" #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 "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/LogWindow.h" +#include "DolphinWX/LogConfigWindow.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 "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/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 // wxWidgets +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" +#include "Core/VolumeHandler.h" +#include "DiscIO/NANDContentLoader.h" #ifdef _WIN32 #ifndef SM_XVIRTUALSCREEN @@ -78,7 +78,7 @@ Core::GetWindowHandle(). // Resources extern "C" { -#include "resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // Dolphin icon }; bool confirmStop = false; diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index bd0fcc562bc..4f57c1e9b22 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -2,16 +2,16 @@ // 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 "DolphinWX/GLInterface/AGL.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 1554f71b36d..8f75df51cd8 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 d8342ce5992..071fce2cc9c 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -1,25 +1,11 @@ -// 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 "DolphinWX/GLInterface/EGL.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 f3e8e5bb88f..54a977aa1b6 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 96cf56134d3..edd7d936654 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 bd4da61b4b6..04ac37086a6 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -2,12 +2,13 @@ // 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 "DolphinWX/GLInterface/GLX.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 92cabf38291..6f6a027ad2d 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/X11_Util.h" +#include "DolphinWX/GLInterface/InterfaceBase.h" class cInterfaceGLX : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h index c13bfe8421b..e01539ab5d0 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 98d0db94416..816731a2493 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 d98410f5617..15b9e41c2cf 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -2,15 +2,16 @@ // 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 "DolphinWX/GLInterface/WGL.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 22f7b3e9cdf..fa8846cfbe1 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 f2e0fb1a40f..19dbb7ab029 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/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp index a20c88fdfee..d3f4c5b9f2e 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/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index f89cdc9514f..ceada3c8a63 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Globals.h" - #include #include #include @@ -12,35 +10,36 @@ #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 "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 "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 "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_Germany.xpm" +#include "DolphinWX/resources/Flag_France.xpm" +#include "DolphinWX/resources/Flag_Italy.xpm" +#include "DolphinWX/resources/Flag_Japan.xpm" +#include "DolphinWX/resources/Flag_USA.xpm" +#include "DolphinWX/resources/Flag_Taiwan.xpm" +#include "DolphinWX/resources/Flag_Korea.xpm" +#include "DolphinWX/resources/Flag_Unknown.xpm" +#include "DolphinWX/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 "DolphinWX/resources/Platform_Wad.xpm" +#include "DolphinWX/resources/Platform_Wii.xpm" +#include "DolphinWX/resources/Platform_Gamecube.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 342df3f64ba..7b3009d7d36 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 bf10bb20c13..7e48bf53d05 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 6ed7d7aefc5..bf3fb06c625 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 e7ab405cb5d..0798b94c2e3 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -7,7 +7,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" enum { diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index 5fe375c04fc..12b4bd8ec83 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 4c389ea5347..19385a2d68c 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -12,12 +12,12 @@ #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 "DolphinWX/X11InputBase.h" #include #include #endif diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index cb3e01eda4b..fabdd9ec55b 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 724413f340b..dc6d2119c6a 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 1b873de4920..cdd946fc5e4 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -6,27 +6,28 @@ #import #endif -#include #include +#include -#include "Common.h" -#include "CommonPaths.h" -#include "Globals.h" +#include "Common/Common.h" +#include "Common/CommonPaths.h" +#include "Common/StringUtil.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 "Core/ConfigManager.h" -#include "resources/isoprop_file.xpm" -#include "resources/isoprop_folder.xpm" -#include "resources/isoprop_disc.xpm" +#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_file.xpm" +#include "DolphinWX/resources/isoprop_folder.xpm" +#include "DolphinWX/resources/isoprop_disc.xpm" struct WiiPartition { diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 82c8bd48a27..05c9945120e 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -4,6 +4,8 @@ #pragma once +#include + #include #include #include @@ -14,14 +16,13 @@ #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 350edcddd34..d707eacf939 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 7c5e10e3a51..ba49e063333 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -11,6 +11,9 @@ // might have to change this setup for wiimote #define PROFILES_PATH "Profiles/" +#include +#include + #include #include #include @@ -22,14 +25,11 @@ #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 fd132475eff..2e722ff53c1 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 2d616909da5..1ec51c7050a 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 92702e2b3fc..8376149f28a 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 4fc5bc8e371..bb1b59cc12a 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 6b416a42e51..868181a7520 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -2,34 +2,33 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#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" #if defined HAVE_X11 && HAVE_X11 #include #endif -#include "CPUDetect.h" -#include "IniFile.h" -#include "FileUtil.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Host.h" +#include "Core/HW/Wiimote.h" -#include "Host.h" // Core -#include "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 "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 "VideoCommon/VideoBackendBase.h" #include diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index cb932c1424c..3901e017ad3 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/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index cfd5b22c9f4..6a1629d0148 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -2,40 +2,40 @@ // 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" #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 "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 "VideoBackendBase.h" -#include "ConfigManager.h" -#include "LogManager.h" -#include "BootManager.h" +#include "VideoCommon/VideoBackendBase.h" bool rendererHasFocus = true; bool running = true; diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index cd9df68cbb7..e7d2466e01d 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 371ffa07fe0..5e4ce3ae6e2 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -13,9 +13,9 @@ #include #include -#include "IniFile.h" -#include "FileUtil.h" -#include "HW/GCMemcard.h" +#include "Core/HW/GCMemcard.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.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 d89a7021022..1703b79ba09 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 ba1affec0b5..c2c85cb3339 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 2f81de33411..a5eadd1e97e 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 bd595855125..e24553b604b 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -4,8 +4,6 @@ #pragma once -#include "CommonTypes.h" - #include #include @@ -18,11 +16,10 @@ #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 3db44891e69..9f63abbdcf7 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 "Core/ConfigManager.h" +#include "Common/CommonPaths.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 efa7d00b1dd..737d161dca9 100644 --- a/Source/Core/DolphinWX/PHackSettings.h +++ b/Source/Core/DolphinWX/PHackSettings.h @@ -6,7 +6,8 @@ #include #include -#include "ISOProperties.h" + +#include "DolphinWX/ISOProperties.h" class CPHackSettings : public wxDialog { diff --git a/Source/Core/DolphinWX/PatchAddEdit.cpp b/Source/Core/DolphinWX/PatchAddEdit.cpp index 9850d2bc32f..09a77a52be4 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 a5bc1f37913..f5e58d69f19 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.h +++ b/Source/Core/DolphinWX/PatchAddEdit.h @@ -6,7 +6,8 @@ #include #include -#include "ISOProperties.h" + +#include "DolphinWX/ISOProperties.h" class CPatchAddEdit : public wxDialog { diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 89527254638..0ccb8bc8904 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 391db0858e5..45d54efdd5e 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 3504ae5c85b..c01d9135696 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 3c495c0686a..f0d65168f0f 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.h +++ b/Source/Core/DolphinWX/UDPConfigDiag.h @@ -1,7 +1,5 @@ #pragma once -#include "UDPWrapper.h" - #include #include #include @@ -13,6 +11,8 @@ #include #include +#include "InputCommon/UDPWrapper.h" + class UDPConfigDiag : public wxDialog { public: diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index afe3b45161f..dfd958ce5cf 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 f2cc9d30713..85c1f0cc30a 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -1,12 +1,8 @@ #pragma once -#include -#include #include - -#include "ConfigManager.h" -#include "VideoConfig.h" -#include "Core.h" +#include +#include #include #include @@ -18,8 +14,11 @@ #include #include -#include "MsgHandler.h" -#include "WxUtils.h" +#include "Common/MsgHandler.h" +#include "Core/Core.h" +#include "Core/ConfigManager.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 267f41e35b1..22a1d5fcc48 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 704bc02b7b6..d47e2f3b758 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 0dff321a3f0..7338a48ca0c 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 "DolphinWX/Frame.h" +#include "DolphinWX/WiimoteConfigDiag.h" +#include "Core/NetPlayProto.h" +#include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteReal/WiimoteReal.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 7d7acc9784b..84262afc5b6 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include #include @@ -11,11 +13,9 @@ #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 617e32901ee..72a9e815428 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 "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 71f0e43a2d0..7830b38db2f 100644 --- a/Source/Core/DolphinWX/X11Utils.cpp +++ b/Source/Core/DolphinWX/X11Utils.cpp @@ -1,32 +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 "DolphinWX/X11Utils.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 "X11Utils.h" - -#include #include #include +#include extern char **environ; #if defined(HAVE_WX) && HAVE_WX #include #include -#include "WxUtils.h" +#include "DolphinWX/WxUtils.h" #endif namespace X11Utils diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index 27c0442d284..66f04bb7ecd 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -4,7 +4,10 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" + +#include "Core/Core.h" +#include "Core/ConfigManager.h" #if defined(HAVE_WX) && HAVE_WX #include @@ -17,8 +20,6 @@ #include #endif -#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 b602b399250..accdd5e97cc 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 8224e8146c3..34b8695ebdb 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 e7ccabd8ca1..9f8f2db4978 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 6ad7b13ad70..fa97e8f222b 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 992bec80b1e..aea09ac97c6 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 f1e2136ba94..7153a8d7f77 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 b63ee9f7938..71b2c03d3a7 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -4,16 +4,17 @@ #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/ExpressionParser.h" +#include "InputCommon/ControllerInterface/Device.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 b9f483da4dd..f2d2460ee67 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 939f9d6da37..f7e7c98776e 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -4,7 +4,7 @@ #pragma once -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" #define DINPUT_SOURCE_NAME "DInput" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 07e439e4eb7..de922b2f57c 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DInputJoystick.h" -#include "DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" +#include #include #include -#include #include #include diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 045a8febc6c..0ac535cdfe1 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 4b17574d7ba..fa036ced79d 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -2,8 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DInputKeyboardMouse.h" -#include "DInput.h" +#include +#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" +#include "InputCommon/ControllerInterface/DInput/DInput.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 +26,7 @@ static const struct const char* const name; } named_keys[] = { -#include "NamedKeys.h" +#include "InputCommon/ControllerInterface/DInput/NamedKeys.h" }; static const struct diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index aeeacca5e24..49f6a402d4c 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -4,7 +4,7 @@ #pragma once -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" #define DIRECTINPUT_VERSION 0x0800 #define WIN32_LEAN_AND_MEAN diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 1b402e9b23f..295fc10b5a0 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 f61099f6fb7..8b4dc65fbb4 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 802d1b8f0fc..4e2f49f4d00 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 deab16829eb..18f972ce9ee 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 ff96aabb4be..7a4dfdacccf 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 8eea274182d..9ef5873702c 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 4217ae01690..95e685c8cef 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 93100a91f0c..50b568cb9a7 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 3ad20ad039f..ffbe475840e 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 dbf5beff3cf..6e0623e716e 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 170e4ae9f22..36705075eed 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 101971dab6f..fc784b81c69 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 074308305c6..64c012c1c1c 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 f9ed688932c..15f39998b95 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 a5b382e1ff1..7574641258b 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 39704821d76..1f4629a4d5f 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -5,7 +5,7 @@ #pragma once -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" #define NOMINMAX #include diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 4da005fa65f..802346b81d2 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 4357ee9b5a2..de2ea1a06ac 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -6,7 +6,7 @@ #pragma once -#include "../Device.h" +#include "InputCommon/ControllerInterface/Device.h" extern "C" { #include diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index e507b88c9f1..8484b9116de 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -1,4 +1,4 @@ -#include "Xlib.h" +#include "InputCommon/ControllerInterface/Xlib/Xlib.h" #include diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index ed2e3098b49..9c506f67fee 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 e3e6d318afa..94ec1a2b461 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 "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 8fb284fc662..42a5b7b12fa 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 79b4fc020c1..a50dbc17caa 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 8d57c703cea..82f9635aea3 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 1db21086e4a..b83c7f4301c 100644 --- a/Source/Core/InputCommon/UDPWrapper.cpp +++ b/Source/Core/InputCommon/UDPWrapper.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "UDPWrapper.h" +#include "InputCommon/UDPWrapper.h" -#include -#include +#include +#include #include const std::string DefaultPort(const int index) diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h index 42b23f45d56..4a6c2434411 100644 --- a/Source/Core/InputCommon/UDPWrapper.h +++ b/Source/Core/InputCommon/UDPWrapper.h @@ -4,13 +4,14 @@ #pragma once -#include "UDPWiimote.h" - -#include "Common.h" -#include "ControllerEmu.h" -#include "IniFile.h" #include +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/UDPWiimote.h" + +#include "Common/Common.h" +#include "Common/IniFile.h" + class UDPWrapper : public ControllerEmu::ControlGroup { public: diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp index 9b39f31d58b..e3df6e88488 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 "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 b2b917a7cf9..c05ba4a0f80 100644 --- a/Source/Core/InputCommon/X11InputBase.h +++ b/Source/Core/InputCommon/X11InputBase.h @@ -4,7 +4,7 @@ #pragma once -#include "Common.h" +#include "Common/Common.h" #include #include diff --git a/Source/Core/InputCommon/stdafx.cpp b/Source/Core/InputCommon/stdafx.cpp index b602b399250..d2ad7685585 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 5434354f375..a2ed0f42688 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "StringUtil.h" -#include "VideoConfig.h" +#include "Common/StringUtil.h" +#include "VideoCommon/VideoConfig.h" -#include "D3DBase.h" -#include "D3DTexture.h" -#include "GfxState.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DTexture.h" +#include "VideoBackends/D3D/GfxState.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h index 7f26cbd3cc9..a2afabbaf82 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -7,9 +7,10 @@ #include #include #include -#include "Common.h" #include +#include "Common/Common.h" + namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.cpp b/Source/Core/VideoBackends/D3D/D3DBlob.cpp index 26c8c8ba851..79fccd3dcf9 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 b91907a1b33..7e00ba689a0 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 51a51b72330..21590143e7b 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 84fb03aad86..fc0951ab4b5 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 abf34b3cca4..f0114cad95f 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 26a9b38af98..9dd7f23e39f 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 653b32a2732..c3569fded9a 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 726037a2f3f..6b217fd0a13 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 c55ec3c696e..28153b56224 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 cc0b74d1e15..c31c45e2ea3 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 5717baee93b..9e761b4ee34 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 1974a71f0d8..36f519f9741 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/LineGeometryShader.h" +#include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DShader.h" +#include "VideoCommon/VertexShaderGen.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.h b/Source/Core/VideoBackends/D3D/LineGeometryShader.h index 987016fe9d2..4bcb159314a 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 824778d2383..661e1e46097 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 0a8243ed5c2..fdb54bb1893 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/GfxState.h" +#include "VideoBackends/D3D/FramebufferManager.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 48832535e64..e581775b73d 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 c7eb97ee0b5..61a501d6404 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 99c20a373ce..c8f9d080086 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 bb87720891e..4c234517a36 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 dee930ccfe4..55beee1d61b 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.h +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h @@ -4,11 +4,10 @@ #pragma once -#include "PixelShaderGen.h" - +#include #include -#include +#include "VideoCommon/PixelShaderGen.h" enum DSTALPHA_MODE; diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp b/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp index d8dc17317bd..5e7cb5eda63 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 1b1c5812c1c..b24f73d486a 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 f9b40dddbda..623e5b471be 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/Core.h" +#include "Core/ConfigManager.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 5c5a922cf18..b5948164d4d 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 0f1cf62cf07..816fe32a3a5 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 e6f0c42f842..61f0e3f5f69 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 27bee7240e8..7fc1ed913ad 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -2,19 +2,19 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "RenderBase.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/TextureCache.h" +#include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoBackends/D3D/TextureEncoder.h" +#include "VideoBackends/D3D/PSTextureEncoder.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 "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 91603bc56de..991bbe15cfc 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 d43f4cefeb8..56f4092ea8d 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 a85c85027d4..06ade13fa2a 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 fea814bac2b..e74514d85cf 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 b3a399ed5ef..7d35d84a367 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 8b28790157d..0c9c739f6b0 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 15224c478b6..a158aced0bb 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 bc6c66d29bd..25d69aed125 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 655059cd563..b5ac5200a61 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 2c8179c91d6..2fe48f3a06d 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 4932c0e3670..023ad44ad1b 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 7c408e10b95..195c34a7fe1 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 d2169a7c918..9913bb2a4f2 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/Globals.h" +#include "VideoBackends/OGL/FramebufferManager.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 34c8b80a8c6..db63955cc4f 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 e765d6d53a0..32ebf8bb061 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 4e80990b479..990dc72abb9 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 328f9269ab7..02644c14aeb 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 75ab8c75283..16152998b49 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 360409065c5..bec25986806 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 d3ac931ea69..96841a224e2 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 88bed7780a6..fc4214bf2e2 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 61ce3b08a93..6cde03489f1 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 7afdb0d259d..b2d3b15471e 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 5bcba282ec5..75031aa053b 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 154ae14ee0a..bbdf2f2c074 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 284073287d4..0fd26bac252 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 5807814939b..a8ef567e0cd 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 9b81bede4a0..4c6b7342e07 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 44fea1b3694..3e690cc8d03 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 caf88efd946..7c3c22c4270 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/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/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/KHR_debug.h" +#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h" +#include "VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h" namespace GLExtensions { diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h b/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h index 71cda102a4b..e85776c3c1d 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 0db71cd4899..7a1747d70ea 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 3645f495e6c..09b092179b7 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 ec5e37b85a2..0efd21f370f 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 4023aded5e8..d502bcd6a13 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 4e4c7dd8f57..2c1cd78522e 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 d9870d087ce..d88c0f3af86 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 09a252fd06c..fc741930c51 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 9fc4628edea..93a489650d8 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 27f4678254e..ce6ece39e4d 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 ff2ff10f1c4..1822dd5a9fe 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 90a9d5d1593..18386f725c5 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 73df97389a4..abe2505e746 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 67fa8f237e6..a46e3815864 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 268322335b0..d1f9012716f 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 4f3f2ad0d70..6b6a46bbf39 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/x64ABI.h" +#include "Common/x64Emitter.h" +#include "Common/MemoryUtil.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 4f30658a596..8e2de6dd4e9 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 8d4f75aa5ac..43534855e36 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 c0460e489a5..211cf5d9371 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 0cd93116f4c..1a6f015bbcb 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 6804417938c..a701158a6d5 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/Statistics.h" +#include "VideoCommon/PixelShaderManager.h" +#include "VideoCommon/VertexShaderManager.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index ee3c174ec63..93ac124925d 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 "Core/ConfigManager.h" +#include "Common/LinearDiskCache.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 d3e4272d28f..e5458ee4552 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 8a07165a130..464054307e8 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/Timer.h" +#include "Common/Thread.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 fb15462921d..d6486c6e221 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 01f5959c570..c9bf6998437 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 ef470e0758b..ec357c0cb65 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/Render.h" +#include "VideoBackends/OGL/GLUtil.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index f21ab60a506..7c9348d157b 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 00e8579a153..78b73e1da32 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 c4a89b004f5..628c9a9432e 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 +#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 3c0e421bc7c..b3586955347 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 08ebde398c8..753bd64ada3 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 f86241e5ffb..4917528b4ac 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 670dd7d8a09..4af1a489539 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 ded0ff27969..aec0712c2fb 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 761772a8edb..8b41b006fe3 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 184b56724d8..b37f428531b 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 7ea6077d306..0866e823a71 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 7c408e10b95..a4735a1513d 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 946e792b3f5..b62776fa64b 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/VideoCommon.h" +#include "VideoCommon/TextureDecoder.h" void InitBPMemory() diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h index 6ea09293cfe..5046e3daedd 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 98734deeb5b..cb57ea5ccfa 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 a08fac2a738..4606a9bb59e 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 6d6069b262d..976bbeb1044 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 acf32b32ff3..a7e75277ae4 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 75c6c08ada5..80259a45761 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/SWVideoConfig.h" +#include "VideoBackends/Software/SWStatistics.h" +#include "VideoBackends/Software/SWCommandProcessor.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 1f042b80603..b800ba8ee28 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 3a8d7d7ad6e..9c7786202e5 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 c5c77244622..9da56f3290f 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 59ef834a037..da37bef244b 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 131b3dfb008..9efc2a6fba0 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 f9c58103893..cad3fe07a56 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 a6e22f9850f..fe6d336609e 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 ea2b220d53c..069876741d5 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 4ba83507de8..3d33b18d40e 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 461ce7d486c..7876ac45851 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 377a437c647..8c594555311 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 a4599145b0e..7d64b8aa5d2 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 450ce5712a2..bf37b47b8e4 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 92ca7282300..885ef6cff50 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 e32384982ed..bc92575da03 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 37f26be78e9..93cab0ba9d1 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 783a8eee0aa..fab7b4bf25c 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 83330d772ac..20ba425e227 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 c033e2f6846..e1d3ec8c0bb 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 b77953f06f0..61f41c7e888 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 a8cbdae326c..fbecdaeb79d 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 0b6a023bffa..ed6bf0bb362 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 36f91265cb9..091eab35faa 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 0de5b93998e..758f9bb7222 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 132b40fa817..efc4471d0e8 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -2,39 +2,40 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#include "Common.h" +#include "Common/Common.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 "Common/Atomic.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.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/SWRenderer.h" +#include "VideoBackends/Software/SWPixelEngine.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" + +#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 b08584e0a9c..c324dcf767f 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 37e50175814..36163f06bd6 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 254d4cbcff6..5ebdcd714ce 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 0642778e0b8..617dee842b9 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 07bb162cd6b..6c24257fe3f 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 c675f1fca62..84e8004a2e9 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 0657f701f2c..4f5a3a4a678 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -2,11 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "TextureSampler.h" - -#include "BPMemLoader.h" -#include "TextureDecoder.h" -#include "HW/Memmap.h" +#include "Core/HW/Memmap.h" +#include "VideoBackends/Software/BPMemLoader.h" +#include "VideoBackends/Software/TextureSampler.h" +#include "VideoCommon/TextureDecoder.h" #include diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h index 6cd13537bf6..d821ace25e3 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 e00f05e4aa8..f0722ce7973 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 08f8877e2bb..192355cf7d7 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 89fbc4dd1d4..1559427599e 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 8d0d999bf7b..d730efd6fe9 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 e0884dd79f2..057ceb15e1f 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h @@ -4,12 +4,12 @@ #pragma once -#include #include +#include -#include "SWVideoConfig.h" -#include "VideoBackendBase.h" -#include "ConfigManager.h" +#include "Core/ConfigManager.h" +#include "VideoBackends/Software/SWVideoConfig.h" +#include "VideoCommon/VideoBackendBase.h" #include #include diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/XFMemLoader.cpp index 899a5fab480..07d53932230 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 d790c98cd66..4a827cd7a7b 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 b602b399250..dff656a86a0 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 d6f2755e33b..c926eb9c585 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; diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h index b12f316ab36..c9aa2a47784 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 3cc1764f3b1..a3bcd3af300 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 b750e81b484..dfaaa396008 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 7272ed09930..7902bf70a64 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 749ae4d1c26..35f1e79d9b0 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 2434d347fac..c417e0d26b2 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 cf67ba2a6e6..2a994433463 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 fd8874d156c..f86e206f6fc 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 7a5af3cc19b..4146caa5903 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.h b/Source/Core/VideoCommon/CommandProcessor.h index f57402f0ec4..09a5f454cac 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 2066334f752..dd963b1f584 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 e936060688a..3a22fa8c74a 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/TextureCacheBase.h" +#include "VideoCommon/PixelShaderGen.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 b15c5cfbd43..1a0475f0a6d 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 b9707b30622..c9bcb66130d 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 23a72086051..b5570a9a0fa 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 d9464afedc1..cdf7c1d85fd 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 92b97536231..178a8c6db64 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 83127f5a75a..9045c562c4d 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 a975da624c1..e5e8a856cac 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 be668caa03f..6f0b73f570b 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 c88e4ae5d5d..286e3e28d58 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 18267e48699..c51d0b8b6d8 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 193f058541d..ad0449dd2f8 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 7022526ad87..5df630651a3 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 0789ec1e1ae..809a2be2e21 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 18f2b66d117..e5d09c8d96d 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 f74f92ad5c5..c763416eb8f 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/ShaderGenCommon.h" +#include "VideoCommon/NativeVertexFormat.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 57414d21cdc..eb38557eb35 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 43c0d7a1408..8694fe2d1a6 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 a3a5ed0addb..3b4d574439e 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 c57e34baa99..8dd53c77a6f 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 9f14a90526b..7ea6d55daaf 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 cb47639b817..29cee8e1a53 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -12,28 +12,26 @@ // 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 "VertexLoaderManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/FifoPlayer/FifoRecorder.h" +#include "Core/HW/Memmap.h" -#include "Statistics.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/XFMemory.h" -#include "XFMemory.h" -#include "CPMemory.h" -#include "BPMemory.h" - -#include "Fifo.h" -#include "DataReader.h" - -#include "VideoConfig.h" +#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/DataReader.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/OpcodeDecoding.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VertexLoaderManager.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoCommon.h" u8* g_pVideoData = 0; bool g_bRecordFifoData = false; diff --git a/Source/Core/VideoCommon/PerfQueryBase.cpp b/Source/Core/VideoCommon/PerfQueryBase.cpp index ada539c05ec..cf59b3101c6 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 ad112ede9d2..7b68b84d758 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 de46dce77ab..9436d93db79 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -6,19 +6,20 @@ // 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 "Common/ChunkFile.h" +#include "Common/Common.h" +#include "Common/Atomic.h" -#include "PixelEngine.h" -#include "RenderBase.h" -#include "CommandProcessor.h" -#include "HW/MMIO.h" -#include "HW/ProcessorInterface.h" -#include "State.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 9bbf42eec89..d021859cd68 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 fe6db69520e..a2438108326 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 #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 8a30e355396..6ed69604205 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 0c35bb44e45..74cc5c1be3d 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 c5be1120bec..437c088e114 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/XFMemory.h" +#include "VideoCommon/ConstantManager.h" +#include "VideoCommon/PixelShaderGen.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 28e7893b092..e275238ab0c 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 fb99362a2af..bf86265b1af 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -14,15 +14,16 @@ #pragma once -#include "VideoCommon.h" -#include "Thread.h" -#include "MathUtil.h" -#include "NativeVertexFormat.h" -#include "FramebufferManagerBase.h" -#include "BPMemory.h" - #include +#include "Common/Thread.h" +#include "Common/MathUtil.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 93f4f14ef32..64d30a0dbcb 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 81219201bcd..d1d6312e417 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 daa8700d7f1..989549e6ce5 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 6748228b2f3..5abce6fdee9 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 81fcd88ee6f..517f45433d5 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 209b7e4ab78..d6cf45c777a 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/TextureConversionShader.h" +#include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoConfig.h" #define WRITE p+=sprintf diff --git a/Source/Core/VideoCommon/TextureConversionShader.h b/Source/Core/VideoCommon/TextureConversionShader.h index b3c05418c88..6832cc0614e 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 dd1aef199a8..284b992f457 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_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 3f7c7554c8d..d49e4ddb870 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/TextureDecoder.h" +#include "VideoCommon/LookUpTables.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 7246d4812ad..45dc47f2c3c 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/VertexLoaderManager.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" +#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 eeb9ec766b0..6b720b54aa5 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 fbc48e5fb71..b7ad98e67d5 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 e7461acdc13..7e6c46818ac 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 88d7d557a9b..03fee032928 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 24d2f0b1ff9..5cc366fdcec 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 34f8736237d..5cbe6232bbf 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 ee26acfbe76..5ca07e77929 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 dae72e22b83..d8fcf9bbaa4 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 8d3f61809b5..30550b96269 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 0ea44d9a57c..62134854ec1 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 997cf308d13..e98db7b3ee5 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 5d1855d8d92..67cb4c1231d 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 65d605ce686..e705845a6a8 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 c1f5b8188e2..5e88d978678 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -2,25 +2,23 @@ // 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 "VertexShaderGen.h" -#include "VertexShaderManager.h" -#include "BPMemory.h" -#include "CPMemory.h" -#include "XFMemory.h" -#include "VideoCommon.h" -#include "VertexManagerBase.h" -#include "RenderBase.h" +#include "VideoCommon/BPMemory.h" +#include "VideoCommon/CPMemory.h" +#include "VideoCommon/XFMemory.h" +#include "VideoCommon/RenderBase.h" +#include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VertexManagerBase.h" +#include "VideoCommon/VertexShaderGen.h" +#include "VideoCommon/VertexShaderManager.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 08b6e8119c6..d99f07fe219 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 7e9fbfd033d..a9a6c1f77b7 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" +#include "VideoCommon/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" 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 62423b33b45..66ea7857a8f 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 d71390c999e..b18afce482b 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 37c68786dd8..e2caac92a5f 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -4,15 +4,17 @@ #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/VideoConfig.h" +#include "VideoCommon/VideoCommon.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 6afb84f697c..4c303054402 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 9bfbeeaf52d..bb0a3c3a9d7 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/CPMemory.h" +#include "VideoCommon/XFMemory.h" +#include "VideoCommon/Fifo.h" +#include "VideoCommon/CommandProcessor.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" static void DoState(PointerWrap &p) { diff --git a/Source/Core/VideoCommon/VideoState.h b/Source/Core/VideoCommon/VideoState.h index eeb7fb65f16..ba366ca5267 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 139cc35940c..ded761179ae 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 50934adf301..e5f9ae05763 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 2b9e0d45a5b..15b7568d6c3 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 9d72bbfb43e..1c091164818 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 b602b399250..29b70f0fe34 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/VSProps/Base.props b/Source/VSProps/Base.props index 11bf8569147..2ffcafa8f76 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -22,6 +22,7 @@ $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ $(IntDir)bin\ $(ProjectName)$(TargetSuffix) + $(SolutionDir)Core;$(IncludePath) @@ -119,4 +120,4 @@ - + \ No newline at end of file From dc1db82f70b58e97b425a1a586f60dc2d3be8eb0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Feb 2014 12:09:38 +0100 Subject: [PATCH 02/19] Fix Linux build --- CMakeLists.txt | 3 +++ Source/Core/Core/HW/Memmap.cpp | 2 +- Source/Core/DolphinWX/ConfigMain.h | 2 ++ Source/Core/DolphinWX/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/HotkeyDlg.h | 2 +- Source/Core/DolphinWX/Main.cpp | 8 ++++---- Source/Core/DolphinWX/X11Utils.h | 8 ++++++++ Source/Core/InputCommon/InputConfig.cpp | 2 +- Source/pch.h | 5 +++-- 9 files changed, 24 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c96f87ceb47..09e2535e6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -472,6 +472,9 @@ endif() ######################################## # Setup include directories (and make sure they are preferred over the Externals) # +include_directories(Source/Core) + +# TODO(delroth): Remove when relative-includes is done. include_directories(Source/Core/AudioCommon) include_directories(Source/Core/Common) include_directories(Source/Core/Core) diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index fff29ad8021..fa569618d26 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -22,7 +22,7 @@ #include "Core/HW/DSP.h" #include "Core/HW/DVDInterface.h" #include "Core/HW/EXI.h" -#include "core/HW/GPFifo.h" +#include "Core/HW/GPFifo.h" #include "Core/HW/MemoryInterface.h" #include "Core/HW/Memmap.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 8d2c96ddce4..2dde08470cc 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -7,8 +7,10 @@ #include #include #include +#include #include #include + #include "Core/ConfigManager.h" #if defined(HAVE_XRANDR) && HAVE_XRANDR #include "DolphinWX/X11Utils.h" diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index ceada3c8a63..169dc6926ff 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -25,7 +25,7 @@ #include "DolphinWX/ISOProperties.h" #include "DolphinWX/Main.h" #include "DolphinWX/WxUtils.h" -#include "DolphinWx/resources/Flag_Europe.xpm" +#include "DolphinWX/resources/Flag_Europe.xpm" #include "DolphinWX/resources/Flag_Germany.xpm" #include "DolphinWX/resources/Flag_France.xpm" #include "DolphinWX/resources/Flag_Italy.xpm" diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h index 19385a2d68c..34e9f6088e9 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -17,7 +17,7 @@ #include "DolphinWX/WXInputBase.h" #if defined(HAVE_X11) && HAVE_X11 -#include "DolphinWX/X11InputBase.h" +#include "InputCommon/X11InputBase.h" #include #include #endif diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 868181a7520..02c5febd5e1 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -12,10 +12,6 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" -#if defined HAVE_X11 && HAVE_X11 -#include -#endif - #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/Host.h" @@ -32,6 +28,10 @@ #include +#if defined HAVE_X11 && HAVE_X11 +#include +#endif + #ifdef _WIN32 #include diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index 66f04bb7ecd..c5c84e902c8 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -9,6 +9,14 @@ #include "Core/Core.h" #include "Core/ConfigManager.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 + #if defined(HAVE_WX) && HAVE_WX #include #include diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 94ec1a2b461..859036c69ee 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "CommonPaths.h" +#include "Common/CommonPaths.h" #include "Core/ConfigManager.h" #include "Core/HW/Wiimote.h" #include "InputCommon/InputConfig.h" diff --git a/Source/pch.h b/Source/pch.h index 2851adefcac..a8d687d9c6c 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" From 362dec9c7cde65fe446d671a49962888f391e917 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Feb 2014 12:18:47 +0100 Subject: [PATCH 03/19] Dolphin now builds on Linux with only Source/Core as include dir --- CMakeLists.txt | 12 ------- Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 4 +-- Source/Core/Core/HW/EXI_Channel.cpp | 7 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 2 +- Source/Core/VideoCommon/AVIDump.cpp | 6 ++-- Source/Core/VideoCommon/CommandProcessor.cpp | 36 +++++++++---------- 6 files changed, 26 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09e2535e6a2..10ba7c75600 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -474,18 +474,6 @@ endif() # include_directories(Source/Core) -# TODO(delroth): Remove when relative-includes is done. -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) - ######################################## # Process externals and setup their include directories # diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index bfeae3f45ba..c29a3e9d7ca 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -4,7 +4,6 @@ #include "Common/Common.h" #include "Common/Hash.h" - #include "Core/Host.h" #include "Core/ConfigManager.h" #include "Core/DSP/DSPAnalyzer.h" @@ -14,8 +13,7 @@ #include "Core/HW/DSPLLE/DSPSymbols.h" #include "Core/HW/DSPLLE/DSPLLETools.h" #include "Core/PowerPC/PowerPC.h" - -#include "OnScreenDisplay.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/EXI_Channel.cpp b/Source/Core/Core/HW/EXI_Channel.cpp index a62a5b815b3..902f50e7d4c 100644 --- a/Source/Core/Core/HW/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI_Channel.cpp @@ -3,20 +3,19 @@ // Refer to the license.txt file included. #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/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 9318e10d6fe..4bcccd8f03f 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 @@ -8,6 +8,7 @@ #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" @@ -457,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/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index c926eb9c585..e2c24178376 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -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/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 3383d7f79a7..21955b27a55 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/Common.h" +#include "Common/MathUtil.h" +#include "Common/Thread.h" +#include "Common/Atomic.h" +#include "Common/ChunkFile.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 { From eee549f92b34188b6011a5a253e22f8af1d084f2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 18 Feb 2014 13:21:12 -0500 Subject: [PATCH 04/19] Scope the Windows include directory to only point to Source/Core/. Also fix the Windows build with this change. --- Source/Core/Core/Core.cpp | 2 +- Source/VSProps/Base.props | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index a40ca025452..4c2eb66b23f 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -4,7 +4,7 @@ #ifdef _WIN32 #include -#include "EmuWindow.h" +#include "VideoCommon/EmuWindow.h" #endif #include "AudioCommon/AudioCommon.h" diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 2ffcafa8f76..36fe12a6ea1 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -22,7 +22,6 @@ $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ $(IntDir)bin\ $(ProjectName)$(TargetSuffix) - $(SolutionDir)Core;$(IncludePath) @@ -32,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) From edb43cfe616da48711a3fe5d32d06b9079b2d908 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 18 Feb 2014 19:08:17 -0500 Subject: [PATCH 05/19] Fix the OSX build. Turns out Dolphin uses some macros that clash on OSX. However thankfully, this include is only used in Frame.cpp. --- Source/Core/DolphinWX/Frame.cpp | 5 ++++- Source/Core/DolphinWX/Frame.h | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 194699b024f..11e444bc8c5 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,6 +10,10 @@ // m_Panel. The new child window handle that is returned by CreateWindow() can // be accessed from Core::GetWindowHandle(). +#ifdef __APPLE__ +#include +#endif + #include #include "Common/Common.h" @@ -43,7 +47,6 @@ extern "C" { #include "DolphinWX/resources/Dolphin.c" // 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 33af0f11ca7..fb69dd988d2 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -15,10 +15,6 @@ #include #include -#ifdef __APPLE__ -#include -#endif - #include "Common/CDUtils.h" #include "Core/Movie.h" #include "DolphinWX/Globals.h" From 939df46674d5ce3803292431495e479bf6f434b5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 01:45:41 +0100 Subject: [PATCH 06/19] Add an automated tool that does basic checking of includes sort order. --- Tools/check-includes.py | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100755 Tools/check-includes.py diff --git a/Tools/check-includes.py b/Tools/check-includes.py new file mode 100755 index 00000000000..d8d1c33c0d2 --- /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) From 3f9c38d2314a259a9c34dd89bcdfab3af00a02f5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 01:54:11 +0100 Subject: [PATCH 07/19] Fix more header sorting issues in Common/ (now check-includes clean). --- Source/Core/Common/ColorUtil.cpp | 2 +- Source/Core/Common/Common.h | 13 ++++++------- Source/Core/Common/CommonTypes.h | 2 +- Source/Core/Common/FileUtil.cpp | 18 +++++++++--------- Source/Core/Common/IniFile.cpp | 2 +- Source/Core/Common/LogManager.cpp | 2 +- Source/Core/Common/SDCardUtil.cpp | 4 ++-- Source/Core/Common/SettingsHandler.cpp | 12 ++++++------ Source/Core/Common/StringUtil.cpp | 2 +- Source/Core/Common/Thread.h | 6 +++--- Source/Core/Common/Timer.cpp | 4 ++-- Source/Core/Common/Version.cpp | 2 +- Source/Core/Common/stdafx.h | 2 +- 13 files changed, 35 insertions(+), 36 deletions(-) diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index ffd44f3d964..0930668fe46 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/Common.h" #include "Common/ColorUtil.h" +#include "Common/Common.h" namespace ColorUtil { diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 44869720773..b5d78bafd7e 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 // SVN version number extern const char *scm_desc_str; @@ -45,10 +45,6 @@ private: }; #endif -#include "Common/Log.h" -#include "Common/CommonTypes.h" -#include "Common/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 "Common/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/CommonTypes.h b/Source/Core/Common/CommonTypes.h index 56210da18f0..6ec7045c42d 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/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index ca36bad966c..561435fb160 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -3,32 +3,32 @@ // Refer to the license.txt file included. #include +#include #include #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 #ifndef S_ISDIR diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp index 7c4ec737e53..8430f01e5e7 100644 --- a/Source/Core/Common/IniFile.cpp +++ b/Source/Core/Common/IniFile.cpp @@ -6,8 +6,8 @@ // see IniFile.h #include -#include #include +#include #include #include #include diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 31a6d8c9cfd..a880b66268b 100644 --- a/Source/Core/Common/LogManager.cpp +++ b/Source/Core/Common/LogManager.cpp @@ -9,8 +9,8 @@ #endif #include "Common/FileUtil.h" #include "Common/LogManager.h" -#include "Common/Timer.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/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 16a9b13f4ce..e73aa26204e 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -29,10 +29,10 @@ // Modified for Dolphin. #include -#include #include #include -#include +#include +#include #include #include "Common/FileUtil.h" diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp index beeaa82da9d..b7a7aeedbdf 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 "Common/CommonPaths.h" -#include "Common/SettingsHandler.h" -#include "Common/Timer.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/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 233bc8717b6..3031669323b 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include -#include #include +#include #include "Common/CommonPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index dda363094ff..999689cf722 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -5,13 +5,13 @@ #pragma once #include -#include +#include +// Don't include common.h here as it will break LogManager +#include "Common/CommonTypes.h" #include "Common/StdConditionVariable.h" #include "Common/StdMutex.h" #include "Common/StdThread.h" -// Don't include common.h here as it will break LogManager -#include "Common/CommonTypes.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 d9299e7b493..1670e861dbe 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #ifdef _WIN32 -#include #include #include +#include #else #include #endif diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 76546f040fb..1223bf373d9 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/Common.h" #include "scmrev.h" +#include "Common/Common.h" #ifdef _DEBUG #define BUILD_TYPE_STR "Debug " diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h index 8b1c934c4fc..832a942e212 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 From 8ea8da6ebc75af2475ede05f5668b49979b72941 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:02:01 +0100 Subject: [PATCH 08/19] Fix more header sorting issues in DiscIO/ (now check-includes clean). --- Source/Core/DiscIO/BannerLoaderGC.cpp | 2 +- Source/Core/DiscIO/BannerLoaderWii.cpp | 2 +- Source/Core/DiscIO/CompressedBlob.cpp | 2 +- Source/Core/DiscIO/NANDContentLoader.cpp | 2 +- Source/Core/DiscIO/WiiWad.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp index 960cf70a408..bc6ba3470ba 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/BannerLoaderGC.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/CommonTypes.h" #include "Common/ColorUtil.h" +#include "Common/CommonTypes.h" #include "DiscIO/BannerLoaderGC.h" namespace DiscIO diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp index d530cfbf65a..a037a830bd1 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/BannerLoaderWii.cpp @@ -5,8 +5,8 @@ #include #include -#include "Common/CommonTypes.h" #include "Common/ColorUtil.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/BannerLoaderWii.h" diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 7e58c150927..f3dd250b788 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -10,13 +10,13 @@ #endif #include +#include #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/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index cd8e7c98c60..35d51a56e14 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -7,8 +7,8 @@ #include #include "Common/FileUtil.h" -#include "Common/MathUtil.h" #include "Common/Log.h" +#include "Common/MathUtil.h" #include "Common/StringUtil.h" #include "DiscIO/NANDContentLoader.h" diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 09c98085887..8c6cda77bd6 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "NANDContentLoader.h" #include #include @@ -10,6 +9,7 @@ #include "Common/FileUtil.h" #include "Common/Log.h" #include "Common/MathUtil.h" +#include "DiscIO/NANDContentLoader.h" #include "DiscIO/WiiWad.h" namespace DiscIO From fca12c4c4e6a2cd381a34e5e1bc80ffb22bd35c3 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:11:52 +0100 Subject: [PATCH 09/19] Fix more header sorting issues in AudioCommon/ (now check-includes clean). --- Source/Core/AudioCommon/AudioCommon.cpp | 4 ++-- Source/Core/AudioCommon/NullSoundStream.cpp | 2 +- Source/Core/AudioCommon/OpenALStream.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 4e387ba1df8..a8229b3f847 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "AudioCommon/AudioCommon.h" -#include "AudioCommon/AOSoundStream.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" diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp index fe41f495081..fcd577f97ae 100644 --- a/Source/Core/AudioCommon/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/NullSoundStream.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "AudioCommon/NullSoundStream.h" -#include "Core/HW/SystemTimers.h" #include "Core/HW/AudioInterface.h" +#include "Core/HW/SystemTimers.h" void NullSound::SoundLoop() { diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index e8f950e5abb..46f7cc34072 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "AudioCommon/aldlist.h" -#include "AudioCommon/OpenALStream.h" #include "AudioCommon/DPL2Decoder.h" +#include "AudioCommon/OpenALStream.h" #if defined HAVE_OPENAL && HAVE_OPENAL From 6847a0fc0c1699eb01fadd50cfaf76e4e34a02cb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:17:31 +0100 Subject: [PATCH 10/19] Fix more header sorting issues in InputCommon/ (now check-includes clean). --- .../ControllerInterface/ControllerInterface.h | 3 +-- .../InputCommon/ControllerInterface/DInput/DInput.h | 7 +++---- .../ControllerInterface/DInput/DInputJoystick.cpp | 11 +++++------ .../DInput/DInputKeyboardMouse.cpp | 5 +++-- .../ControllerInterface/DInput/DInputKeyboardMouse.h | 6 +++--- .../InputCommon/ControllerInterface/XInput/XInput.h | 6 +++--- .../InputCommon/ControllerInterface/Xlib/XInput2.h | 6 +++--- .../InputCommon/ControllerInterface/Xlib/Xlib.cpp | 4 ++-- Source/Core/InputCommon/UDPWrapper.cpp | 6 +++--- Source/Core/InputCommon/UDPWrapper.h | 5 ++--- Source/Core/InputCommon/X11InputBase.cpp | 4 ++-- Source/Core/InputCommon/X11InputBase.h | 6 +++--- 12 files changed, 33 insertions(+), 36 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 71b2c03d3a7..affabafc9b0 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -10,11 +10,10 @@ #include #include - #include "Common/Common.h" #include "Common/Thread.h" -#include "InputCommon/ControllerInterface/ExpressionParser.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.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index f7e7c98776e..b4f1b271998 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -4,17 +4,16 @@ #pragma once -#include "InputCommon/ControllerInterface/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 de922b2f57c..b524f1f0f46 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "InputCommon/ControllerInterface/DInput/DInput.h" -#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" - #include #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/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index fa036ced79d..c9dd9034fe4 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -3,8 +3,9 @@ // Refer to the license.txt file included. #include -#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" + #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 @@ -26,7 +27,7 @@ static const struct const char* const name; } named_keys[] = { -#include "InputCommon/ControllerInterface/DInput/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 49f6a402d4c..558917e9cc3 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -4,13 +4,13 @@ #pragma once -#include "InputCommon/ControllerInterface/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/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 1f4629a4d5f..f3dc398904d 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -5,12 +5,12 @@ #pragma once -#include "InputCommon/ControllerInterface/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.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index de2ea1a06ac..2714b702212 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -6,14 +6,14 @@ #pragma once -#include "InputCommon/ControllerInterface/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 8484b9116de..0d2bdab8f8d 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -1,7 +1,7 @@ -#include "InputCommon/ControllerInterface/Xlib/Xlib.h" - #include +#include "InputCommon/ControllerInterface/Xlib/Xlib.h" + namespace ciface { namespace Xlib diff --git a/Source/Core/InputCommon/UDPWrapper.cpp b/Source/Core/InputCommon/UDPWrapper.cpp index b83c7f4301c..19eb6196797 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 "InputCommon/UDPWrapper.h" - #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 4a6c2434411..11a5ddb4648 100644 --- a/Source/Core/InputCommon/UDPWrapper.h +++ b/Source/Core/InputCommon/UDPWrapper.h @@ -6,11 +6,10 @@ #include -#include "InputCommon/ControllerEmu.h" -#include "InputCommon/UDPWiimote.h" - #include "Common/Common.h" #include "Common/IniFile.h" +#include "InputCommon/ControllerEmu.h" +#include "InputCommon/UDPWiimote.h" class UDPWrapper : public ControllerEmu::ControlGroup { diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp index e3df6e88488..c6dce96a7b0 100644 --- a/Source/Core/InputCommon/X11InputBase.cpp +++ b/Source/Core/InputCommon/X11InputBase.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include +#include +#include #include #include "InputCommon/X11InputBase.h" diff --git a/Source/Core/InputCommon/X11InputBase.h b/Source/Core/InputCommon/X11InputBase.h index c05ba4a0f80..dce3469d9d3 100644 --- a/Source/Core/InputCommon/X11InputBase.h +++ b/Source/Core/InputCommon/X11InputBase.h @@ -4,14 +4,14 @@ #pragma once -#include "Common/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 From ffe588cc240745f0a30595c604083d37e791c670 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:27:20 +0100 Subject: [PATCH 11/19] Fix more header sorting issues in VideoCommon/ (now check-includes clean). --- Source/Core/VideoCommon/CommandProcessor.cpp | 4 ++-- Source/Core/VideoCommon/Debugger.cpp | 2 +- Source/Core/VideoCommon/LightingShaderGen.h | 2 +- Source/Core/VideoCommon/OpcodeDecoding.cpp | 10 ++++------ Source/Core/VideoCommon/PixelEngine.cpp | 4 +--- Source/Core/VideoCommon/PixelShaderGen.cpp | 2 +- Source/Core/VideoCommon/PixelShaderManager.h | 2 +- Source/Core/VideoCommon/RenderBase.h | 3 +-- .../Core/VideoCommon/TextureConversionShader.cpp | 2 +- .../Core/VideoCommon/TextureDecoder_Generic.cpp | 16 ++++++---------- Source/Core/VideoCommon/TextureDecoder_x64.cpp | 2 +- Source/Core/VideoCommon/VertexLoader.cpp | 2 +- Source/Core/VideoCommon/VertexShaderManager.cpp | 7 +++---- Source/Core/VideoCommon/VideoBackendBase.cpp | 4 ++-- Source/Core/VideoCommon/VideoConfig.cpp | 4 +--- Source/Core/VideoCommon/VideoState.cpp | 6 +++--- 16 files changed, 30 insertions(+), 42 deletions(-) diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 21955b27a55..0ccd2517180 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/Atomic.h" +#include "Common/ChunkFile.h" #include "Common/Common.h" #include "Common/MathUtil.h" #include "Common/Thread.h" -#include "Common/Atomic.h" -#include "Common/ChunkFile.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp index 3a22fa8c74a..affeb9183ac 100644 --- a/Source/Core/VideoCommon/Debugger.cpp +++ b/Source/Core/VideoCommon/Debugger.cpp @@ -7,8 +7,8 @@ #include "VideoCommon/Debugger.h" #include "VideoCommon/NativeVertexFormat.h" -#include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VertexShaderGen.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h index c763416eb8f..9379f65775b 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.h +++ b/Source/Core/VideoCommon/LightingShaderGen.h @@ -4,8 +4,8 @@ #pragma once -#include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 29cee8e1a53..8c680a04c54 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -14,24 +14,22 @@ #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/CPMemory.h" -#include "VideoCommon/XFMemory.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/VideoConfig.h" #include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" + u8* g_pVideoData = 0; bool g_bRecordFifoData = false; diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 9436d93db79..4d913dd8366 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -6,16 +6,14 @@ // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!! +#include "Common/Atomic.h" #include "Common/ChunkFile.h" #include "Common/Common.h" -#include "Common/Atomic.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" diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index a2438108326..66965139b80 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include -#include #include #ifdef __APPLE__ #include diff --git a/Source/Core/VideoCommon/PixelShaderManager.h b/Source/Core/VideoCommon/PixelShaderManager.h index 437c088e114..bd0c904b432 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.h +++ b/Source/Core/VideoCommon/PixelShaderManager.h @@ -5,9 +5,9 @@ #pragma once #include "VideoCommon/BPMemory.h" -#include "VideoCommon/XFMemory.h" #include "VideoCommon/ConstantManager.h" #include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/XFMemory.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index bf86265b1af..96bf4312d72 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -16,9 +16,8 @@ #include -#include "Common/Thread.h" #include "Common/MathUtil.h" - +#include "Common/Thread.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/FramebufferManagerBase.h" #include "VideoCommon/NativeVertexFormat.h" diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp index d6cf45c777a..a7db33418f6 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.cpp +++ b/Source/Core/VideoCommon/TextureConversionShader.cpp @@ -10,9 +10,9 @@ #endif #include "VideoCommon/BPMemory.h" +#include "VideoCommon/RenderBase.h" #include "VideoCommon/TextureConversionShader.h" #include "VideoCommon/TextureDecoder.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" #define WRITE p+=sprintf diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index a4f301e36c2..91fb723e843 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 d49e4ddb870..d00a9bb4543 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -8,8 +8,8 @@ //#include "VideoCommon.h" // to get debug logs #include "Common/CPUDetect.h" -#include "VideoCommon/TextureDecoder.h" #include "VideoCommon/LookUpTables.h" +#include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoConfig.h" #ifdef _OPENMP diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 45dc47f2c3c..a9bdb468b89 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -17,11 +17,11 @@ #include "VideoCommon/PixelEngine.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoader.h" -#include "VideoCommon/VertexLoaderManager.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" diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 5e88d978678..a9a9f4de8dd 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -7,17 +7,16 @@ #include "Common/Common.h" #include "Common/MathUtil.h" - #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" -#include "VideoCommon/XFMemory.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" -#include "VideoCommon/VideoCommon.h" -#include "VideoCommon/VideoConfig.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" float GC_ALIGNED16(g_fProjectionMatrix[16]); diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index a9a6c1f77b7..36e52b66547 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "VideoCommon/VideoBackendBase.h" - // TODO: ugly #ifdef _WIN32 #include "VideoBackends/D3D/VideoBackend.h" @@ -11,6 +9,8 @@ #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; static VideoBackend* s_default_backend = NULL; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index e2caac92a5f..c6e37b96fc1 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -7,14 +7,12 @@ #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/VideoConfig.h" #include "VideoCommon/VideoCommon.h" +#include "VideoCommon/VideoConfig.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index bb0a3c3a9d7..b73088ad22e 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/Source/Core/VideoCommon/VideoState.cpp @@ -3,16 +3,16 @@ // Refer to the license.txt file included. #include "VideoCommon/BPMemory.h" -#include "VideoCommon/CPMemory.h" -#include "VideoCommon/XFMemory.h" -#include "VideoCommon/Fifo.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) { From 592ebc5262f13bc587896e678d389fe831df9af7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:56:29 +0100 Subject: [PATCH 12/19] Fix more header sorting issues in DolphinWX/ (now check-includes clean). --- Source/Core/DolphinWX/ARCodeAddEdit.h | 3 +- Source/Core/DolphinWX/AboutDolphin.h | 8 +-- Source/Core/DolphinWX/CheatsWindow.cpp | 4 +- Source/Core/DolphinWX/CheatsWindow.h | 27 +++++----- Source/Core/DolphinWX/ConfigMain.h | 6 +-- .../Core/DolphinWX/Debugger/BreakpointDlg.cpp | 2 +- .../DolphinWX/Debugger/BreakpointView.cpp | 4 +- .../DolphinWX/Debugger/BreakpointWindow.h | 2 +- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 10 ++-- .../Debugger/CodeWindowFunctions.cpp | 4 +- .../DolphinWX/Debugger/DSPDebugWindow.cpp | 3 +- .../Core/DolphinWX/Debugger/DSPDebugWindow.h | 7 ++- .../Core/DolphinWX/Debugger/DebuggerPanel.h | 2 +- Source/Core/DolphinWX/Debugger/JitWindow.cpp | 9 ++-- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 2 +- .../Core/DolphinWX/Debugger/MemoryWindow.cpp | 6 +-- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 2 +- Source/Core/DolphinWX/FifoPlayerDlg.cpp | 5 +- Source/Core/DolphinWX/FifoPlayerDlg.h | 2 +- Source/Core/DolphinWX/Frame.cpp | 15 +++--- Source/Core/DolphinWX/Frame.h | 13 +++-- Source/Core/DolphinWX/FrameTools.cpp | 46 ++++++++-------- Source/Core/DolphinWX/GLInterface/AGL.cpp | 2 +- Source/Core/DolphinWX/GLInterface/EGL.cpp | 2 +- Source/Core/DolphinWX/GLInterface/GLX.h | 2 +- .../Core/DolphinWX/GLInterface/Wayland_Util.h | 2 +- Source/Core/DolphinWX/GLInterface/X11_Util.h | 2 +- Source/Core/DolphinWX/GameListCtrl.cpp | 19 +++---- Source/Core/DolphinWX/Globals.h | 34 ++++++------ Source/Core/DolphinWX/HotkeyDlg.h | 8 +-- Source/Core/DolphinWX/ISOProperties.cpp | 5 +- Source/Core/DolphinWX/ISOProperties.h | 13 +++-- Source/Core/DolphinWX/InputConfigDiag.h | 11 ++-- Source/Core/DolphinWX/Main.cpp | 5 +- Source/Core/DolphinWX/MainAndroid.cpp | 54 +++++++++---------- Source/Core/DolphinWX/MainNoGUI.cpp | 20 +++---- Source/Core/DolphinWX/MemcardManager.h | 12 ++--- Source/Core/DolphinWX/NetWindow.h | 9 ++-- Source/Core/DolphinWX/PHackSettings.cpp | 2 +- Source/Core/DolphinWX/PHackSettings.h | 2 +- Source/Core/DolphinWX/PatchAddEdit.h | 2 +- Source/Core/DolphinWX/UDPConfigDiag.h | 10 ++-- Source/Core/DolphinWX/VideoConfigDiag.h | 11 ++-- Source/Core/DolphinWX/WiimoteConfigDiag.cpp | 4 +- Source/Core/DolphinWX/WiimoteConfigDiag.h | 11 ++-- Source/Core/DolphinWX/WxUtils.cpp | 2 +- Source/Core/DolphinWX/X11Utils.cpp | 9 ++-- Source/Core/DolphinWX/X11Utils.h | 15 +++--- 48 files changed, 213 insertions(+), 237 deletions(-) diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h index 93578941a84..9f22a0c2f4c 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/ARCodeAddEdit.h @@ -4,8 +4,9 @@ #pragma once -#include #include +#include + #include "DolphinWX/ISOProperties.h" class CARCodeAddEdit : public wxDialog diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h index c9fd71495fe..4c1f43053df 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/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index 75c3de57436..398b981fc40 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -3,13 +3,11 @@ // Refer to the license.txt file included. #include "Common/CommonPaths.h" - #include "Core/ActionReplay.h" -#include "Core/Core.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" diff --git a/Source/Core/DolphinWX/CheatsWindow.h b/Source/Core/DolphinWX/CheatsWindow.h index c8acbbd4b23..d7823a982c6 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -4,24 +4,23 @@ #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 "Core/ActionReplay.h" #include "Common/IniFile.h" +#include "Core/ActionReplay.h" #include "DiscIO/Filesystem.h" #include "DolphinWX/GeckoCodeDiag.h" diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 2dde08470cc..9aafeedf0ee 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -4,12 +4,12 @@ #pragma once -#include +#include #include +#include #include #include -#include -#include +#include #include "Core/ConfigManager.h" #if defined(HAVE_XRANDR) && HAVE_XRANDR diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index 0e579924807..047464e0447 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -4,9 +4,9 @@ #include "Common/StringUtil.h" #include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/BreakpointDlg.h" #include "DolphinWX/Debugger/BreakpointWindow.h" -#include "DolphinWX/WxUtils.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 8bd12e11100..4934122ee01 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp @@ -6,11 +6,11 @@ #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/Memmap.h" -#include "Core/PowerPC/PPCSymbolDB.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" -#include "DolphinWX/WxUtils.h" CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id) : wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize, diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h index 9efccb71494..6e8235be0aa 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/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 83bcce660f7..8e58eaa1526 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -7,12 +7,12 @@ #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/ConfigManager.h" -#include "Core/Debugger/PPCDebugInterface.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" @@ -22,19 +22,19 @@ #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 "DolphinWX/WxUtils.h" extern "C" // Bitmaps { - #include "DolphinWX/resources/toolbar_add_memorycheck.c" - #include "DolphinWX/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/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index c7c68458e37..0de5320038c 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -13,10 +13,10 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Host.h" -#include "Core/HLE/HLE.h" #include "Core/Boot/Boot.h" -#include "Core/Debugger/PPCDebugInterface.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" diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 6dcb0e4e1c3..681209c39c8 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include - #include #include "Common/Common.h" diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h index df516061960..e0bf61f8da8 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -10,15 +10,14 @@ #include #include #include - -#include #include #include #include -#include -#include #include +#include #include +#include +#include #include #include "Core/DSP/disassemble.h" diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index a9be1e52905..cdf5144be31 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "VideoCommon/Debugger.h" diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 3e46e98d161..5e3511b8cd3 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -2,26 +2,23 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include // Bochs +#include // Bochs #include #include #include #include -#include "PowerPCDisasm.h" // Bochs -#include "disasm.h" // Bochs - #include "Common/LogManager.h" #include "Common/StringUtil.h" - #include "Core/Core.h" -#include "Core/Debugger/PPCDebugInterface.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" diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 9b09b1becd6..832c13ca9f4 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/Common.h" #include "Core/Host.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index ac66e0d62a7..516ab41788f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -3,22 +3,20 @@ // Refer to the license.txt file included. #include +#include #include -#include #include -#include #include "Common/FileUtil.h" #include "Common/LogManager.h" -#include "Core/Core.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" diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index 2da01361e17..19fbe1cb291 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include #include "Common/StringUtil.h" #include "Common/Thread.h" diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index 67281abbc06..5a8a39bbe3c 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include "Common/Common.h" #include "Common/FileUtil.h" @@ -14,9 +16,6 @@ #include "DolphinWX/WxUtils.h" #include "VideoCommon/OpcodeDecoding.h" -#include -#include - 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 84675432f2a..4e72878fc73 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 11e444bc8c5..2a17f6c21c6 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -13,19 +13,12 @@ #ifdef __APPLE__ #include #endif - #include #include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Timer.h" -#include "DolphinWX/CheatsWindow.h" -#include "DolphinWX/ConfigMain.h" -#include "DolphinWX/Frame.h" -#include "DolphinWX/GameListCtrl.h" -#include "DolphinWX/Globals.h" - #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -36,6 +29,12 @@ #include "Core/HW/GCPad.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "DolphinWX/CheatsWindow.h" +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoBackendBase.h" @@ -44,7 +43,7 @@ // Resources extern "C" { -#include "DolphinWX/resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon }; #ifdef _WIN32 diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index fb69dd988d2..6894f9d7337 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -6,20 +6,19 @@ #include #include - -#include -#include -#include -#include #include -#include +#include +#include +#include #include +#include +#include #include "Common/CDUtils.h" #include "Core/Movie.h" #include "DolphinWX/Globals.h" -#include "DolphinWX/LogWindow.h" #include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" #include "DolphinWX/TASInputDlg.h" #include "DolphinWX/Debugger/CodeWindow.h" diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index a6b71a6b360..ebb345cb5ca 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -16,15 +16,32 @@ Core::GetWindowHandle(). #include +#ifdef __APPLE__ +#include +#endif + #include "Common/Common.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/Timer.h" -#include "VideoCommon/VideoBackendBase.h" -#ifdef __APPLE__ -#include -#endif +#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 "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" + +#include "DiscIO/NANDContentLoader.h" #include "DolphinWX/AboutDolphin.h" #include "DolphinWX/CheatsWindow.h" @@ -35,8 +52,8 @@ Core::GetWindowHandle(). #include "DolphinWX/Globals.h" #include "DolphinWX/HotkeyDlg.h" #include "DolphinWX/InputConfigDiag.h" -#include "DolphinWX/LogWindow.h" #include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" #include "DolphinWX/MemcardManager.h" #include "DolphinWX/NetWindow.h" #include "DolphinWX/TASInputDlg.h" @@ -44,22 +61,7 @@ Core::GetWindowHandle(). #include "DolphinWX/WXInputBase.h" #include "DolphinWX/WxUtils.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/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 "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "Core/PowerPC/PowerPC.h" -#include "Core/VolumeHandler.h" -#include "DiscIO/NANDContentLoader.h" +#include "VideoCommon/VideoBackendBase.h" #ifdef _WIN32 #ifndef SM_XVIRTUALSCREEN @@ -78,7 +80,7 @@ Core::GetWindowHandle(). // Resources extern "C" { -#include "DolphinWX/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 4f57c1e9b22..b8e157d8195 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -7,8 +7,8 @@ #include "Core/ConfigManager.h" #include "Core/Host.h" -#include "DolphinWX/GLInterface/GLInterface.h" #include "DolphinWX/GLInterface/AGL.h" +#include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 071fce2cc9c..1e75df1c801 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "Core/Host.h" -#include "DolphinWX/GLInterface/GLInterface.h" #include "DolphinWX/GLInterface/EGL.h" +#include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" // Show the current FPS diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h index 6f6a027ad2d..3b6639553cd 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/GLInterface/GLX.h @@ -4,8 +4,8 @@ #pragma once -#include "DolphinWX/GLInterface/X11_Util.h" #include "DolphinWX/GLInterface/InterfaceBase.h" +#include "DolphinWX/GLInterface/X11_Util.h" class cInterfaceGLX : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h index af18fb0e70f..9025e005053 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.h b/Source/Core/DolphinWX/GLInterface/X11_Util.h index 94ebce38f12..6294df5f9e6 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 169dc6926ff..800cee9694f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include -#include - #include #include #include +#include +#include +#include #include "Common/CDUtils.h" #include "Common/FileSearch.h" @@ -19,26 +18,24 @@ #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_Germany.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_USA.xpm" -#include "DolphinWX/resources/Flag_Taiwan.xpm" #include "DolphinWX/resources/Flag_Korea.xpm" -#include "DolphinWX/resources/Flag_Unknown.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/Platform_Gamecube.xpm" #include "DolphinWX/resources/rating_gamelist.h" size_t CGameListCtrl::m_currentItem = 0; diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 0798b94c2e3..f114b8f8f4a 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -7,6 +7,23 @@ #pragma once +#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.h b/Source/Core/DolphinWX/HotkeyDlg.h index 34e9f6088e9..8ca4fc9af86 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -4,13 +4,13 @@ #pragma once -#include -#include #include -#include -#include #include +#include #include +#include +#include +#include #include "Common/Common.h" #include "Core/CoreParameter.h" diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index cdd946fc5e4..e632340a6af 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -12,12 +12,9 @@ #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" @@ -25,9 +22,9 @@ #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" -#include "DolphinWX/resources/isoprop_disc.xpm" struct WiiPartition { diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 05c9945120e..12c709f3bec 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -5,17 +5,16 @@ #pragma once #include - -#include -#include #include -#include -#include #include -#include #include -#include +#include #include +#include +#include +#include +#include +#include #include "Common/IniFile.h" #include "Core/ActionReplay.h" diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index ba49e063333..d265e877132 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -13,17 +13,16 @@ #include #include - -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "Common/FileSearch.h" #include "InputCommon/ControllerEmu.h" diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 02c5febd5e1..97cded8c3bb 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include "Common/Common.h" #include "Common/CommonPaths.h" @@ -26,8 +28,6 @@ #include "VideoCommon/VideoBackendBase.h" -#include - #if defined HAVE_X11 && HAVE_X11 #include #endif @@ -74,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/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index d235a8a2831..7f49b1dc289 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 6a1629d0148..ac7941d87ef 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include -#include #include #include "Common/Common.h" @@ -13,6 +13,15 @@ #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 "Core/State.h" @@ -28,15 +37,6 @@ #import #endif -#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" - bool rendererHasFocus = true; bool running = true; diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 5e4ce3ae6e2..775146f4a2b 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 "Core/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/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index e24553b604b..b02f735f6ce 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -6,15 +6,14 @@ #include #include - -#include -#include -#include #include -#include +#include #include #include +#include +#include #include +#include #include "Common/CommonTypes.h" #include "Common/FifoQueue.h" diff --git a/Source/Core/DolphinWX/PHackSettings.cpp b/Source/Core/DolphinWX/PHackSettings.cpp index 9f63abbdcf7..086303ebdfc 100644 --- a/Source/Core/DolphinWX/PHackSettings.cpp +++ b/Source/Core/DolphinWX/PHackSettings.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Core/ConfigManager.h" #include "Common/CommonPaths.h" +#include "Core/ConfigManager.h" #include "DolphinWX/PHackSettings.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/PHackSettings.h b/Source/Core/DolphinWX/PHackSettings.h index 737d161dca9..18965b7b5ff 100644 --- a/Source/Core/DolphinWX/PHackSettings.h +++ b/Source/Core/DolphinWX/PHackSettings.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "DolphinWX/ISOProperties.h" diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h index f5e58d69f19..e57c80a109b 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.h +++ b/Source/Core/DolphinWX/PatchAddEdit.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "DolphinWX/ISOProperties.h" diff --git a/Source/Core/DolphinWX/UDPConfigDiag.h b/Source/Core/DolphinWX/UDPConfigDiag.h index f0d65168f0f..97d5f04d3a8 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.h +++ b/Source/Core/DolphinWX/UDPConfigDiag.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "InputCommon/UDPWrapper.h" diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 85c1f0cc30a..fca4e1371d5 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -3,20 +3,19 @@ #include #include #include - -#include -#include #include -#include -#include #include +#include #include #include #include +#include +#include +#include #include "Common/MsgHandler.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "DolphinWX/WxUtils.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index 7338a48ca0c..2de3bf05a91 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -1,8 +1,8 @@ -#include "DolphinWX/Frame.h" -#include "DolphinWX/WiimoteConfigDiag.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 84262afc5b6..5ae4d88dfdf 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -1,17 +1,16 @@ #pragma once #include - -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "Core/ConfigManager.h" #include "Core/HW/Wiimote.h" diff --git a/Source/Core/DolphinWX/WxUtils.cpp b/Source/Core/DolphinWX/WxUtils.cpp index 72a9e815428..a7ad6d48529 100644 --- a/Source/Core/DolphinWX/WxUtils.cpp +++ b/Source/Core/DolphinWX/WxUtils.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/Common.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/X11Utils.cpp b/Source/Core/DolphinWX/X11Utils.cpp index 7830b38db2f..8b9971d96fe 100644 --- a/Source/Core/DolphinWX/X11Utils.cpp +++ b/Source/Core/DolphinWX/X11Utils.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DolphinWX/X11Utils.h" - #include -#include #include +#include + +#include "DolphinWX/X11Utils.h" extern char **environ; #if defined(HAVE_WX) && HAVE_WX -#include #include +#include + #include "DolphinWX/WxUtils.h" #endif diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index c5c84e902c8..8139e268848 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -4,29 +4,28 @@ #pragma once -#include "Common/Common.h" - -#include "Core/Core.h" -#include "Core/ConfigManager.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 +#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" // EWMH state actions, see From 425f9dcd5155614e66fab635819ef12ee390dc7b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 12:14:09 +0100 Subject: [PATCH 13/19] Fix more header sorting issues in VideoBackends/ (now check-includes clean). --- Source/Core/VideoBackends/D3D/D3DBase.cpp | 3 +-- Source/Core/VideoBackends/D3D/D3DBase.h | 2 +- .../VideoBackends/D3D/LineGeometryShader.cpp | 2 +- .../VideoBackends/D3D/PSTextureEncoder.cpp | 2 +- .../Core/VideoBackends/D3D/PixelShaderCache.h | 2 +- Source/Core/VideoBackends/D3D/Render.cpp | 2 +- .../Core/VideoBackends/D3D/TextureCache.cpp | 7 +++---- .../VideoBackends/OGL/FramebufferManager.cpp | 2 +- .../OGL/GLExtensions/GLExtensions.h | 20 +++++++++---------- .../VideoBackends/OGL/NativeVertexFormat.cpp | 2 +- .../VideoBackends/OGL/ProgramShaderCache.cpp | 2 +- .../VideoBackends/OGL/ProgramShaderCache.h | 2 +- Source/Core/VideoBackends/OGL/Render.cpp | 2 +- Source/Core/VideoBackends/OGL/SamplerCache.h | 2 +- .../Core/VideoBackends/OGL/TextureCache.cpp | 2 +- .../VideoBackends/Software/BPMemLoader.cpp | 2 +- .../Core/VideoBackends/Software/DebugUtil.cpp | 4 ++-- Source/Core/VideoBackends/Software/SWmain.cpp | 13 ++++++------ .../VideoBackends/Software/TextureSampler.cpp | 4 ++-- .../Software/VideoConfigDialog.h | 19 +++++++++--------- 20 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index a2ed0f42688..4575d47f379 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -3,11 +3,10 @@ // Refer to the license.txt file included. #include "Common/StringUtil.h" -#include "VideoCommon/VideoConfig.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 a2afabbaf82..457b62d8d95 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -4,9 +4,9 @@ #pragma once -#include #include #include +#include #include #include "Common/Common.h" diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp index 36f519f9741..b0b71313fac 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp @@ -4,9 +4,9 @@ #include -#include "VideoBackends/D3D/LineGeometryShader.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/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp index fdb54bb1893..3820fb3cb31 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp @@ -5,8 +5,8 @@ #include "Core/HW/Memmap.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DShader.h" -#include "VideoBackends/D3D/GfxState.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" diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.h b/Source/Core/VideoBackends/D3D/PixelShaderCache.h index 55beee1d61b..26981dc481c 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.h +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "VideoCommon/PixelShaderGen.h" diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 623e5b471be..23467f2406e 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -8,8 +8,8 @@ #include "Common/Timer.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/Host.h" #include "Core/Movie.h" diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index 7fc1ed913ad..8e616582ca3 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -7,11 +7,10 @@ #include "VideoBackends/D3D/D3DUtil.h" #include "VideoBackends/D3D/FramebufferManager.h" #include "VideoBackends/D3D/PixelShaderCache.h" -#include "VideoBackends/D3D/TextureCache.h" -#include "VideoBackends/D3D/VertexShaderCache.h" -#include "VideoBackends/D3D/TextureEncoder.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" diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index 9913bb2a4f2..3fca224bb81 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -4,8 +4,8 @@ #include "Core/HW/Memmap.h" -#include "VideoBackends/OGL/Globals.h" #include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/Globals.h" #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/TextureConverter.h" diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index 7c3c22c4270..442fda9e78b 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -6,15 +6,6 @@ #include "DolphinWX/GLInterface/GLInterface.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/ARB_blend_func_extended.h" #include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h" #include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h" @@ -29,9 +20,18 @@ #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_primitive_restart.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/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index 6b6a46bbf39..dad409e47a4 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include "Common/MemoryUtil.h" #include "Common/x64ABI.h" #include "Common/x64Emitter.h" -#include "Common/MemoryUtil.h" #include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/ProgramShaderCache.h" diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index a701158a6d5..79826860a75 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -11,8 +11,8 @@ #include "VideoCommon/Debugger.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/ImageWrite.h" -#include "VideoCommon/Statistics.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 93ac124925d..8db3eb7ccb0 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -4,8 +4,8 @@ #pragma once -#include "Core/ConfigManager.h" #include "Common/LinearDiskCache.h" +#include "Core/ConfigManager.h" #include "VideoBackends/OGL/GLUtil.h" #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 464054307e8..433b71847a0 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -11,8 +11,8 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" -#include "Common/Timer.h" #include "Common/Thread.h" +#include "Common/Timer.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index ec357c0cb65..f8e77a0b93a 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -2,8 +2,8 @@ #include -#include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/Render.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 628c9a9432e..29a2a13a272 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include #ifdef _WIN32 diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index b62776fa64b..738b909fc0e 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp @@ -11,8 +11,8 @@ #include "VideoBackends/Software/SWPixelEngine.h" #include "VideoBackends/Software/Tev.h" -#include "VideoCommon/VideoCommon.h" #include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/VideoCommon.h" void InitBPMemory() diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 80259a45761..95303d4c2fb 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -10,9 +10,9 @@ #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/HwRasterizer.h" -#include "VideoBackends/Software/SWVideoConfig.h" -#include "VideoBackends/Software/SWStatistics.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" diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index efc4471d0e8..b4a4cb2a2ac 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -2,13 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" - -#if defined(HAVE_WX) && HAVE_WX -#include "VideoBackends/Software/VideoConfigDialog.h" -#endif // HAVE_WX - #include "Common/Atomic.h" +#include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/LogManager.h" @@ -26,14 +21,18 @@ #include "VideoBackends/Software/OpcodeDecoder.h" #include "VideoBackends/Software/Rasterizer.h" #include "VideoBackends/Software/SWCommandProcessor.h" -#include "VideoBackends/Software/SWRenderer.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 "VideoBackends/Software/VideoConfigDialog.h" +#endif // HAVE_WX + #include "VideoCommon/OnScreenDisplay.h" #define VSYNC_ENABLED 0 diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index 4f5a3a4a678..87ac79563b3 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/TextureSampler.h" #include "VideoCommon/TextureDecoder.h" -#include - #define ALLOW_MIPMAP 1 namespace TextureSampler diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/VideoConfigDialog.h index 057ceb15e1f..59d76a912ba 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h @@ -6,21 +6,20 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Core/ConfigManager.h" #include "VideoBackends/Software/SWVideoConfig.h" #include "VideoCommon/VideoBackendBase.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - class VideoConfigDialog : public wxDialog { public: From 9a8ea531952faa8def3abfb5d14df6f75659523b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 12:33:13 +0100 Subject: [PATCH 14/19] Fix LinearDiskCache.h relying on a file not directly included. --- Source/Core/Common/LinearDiskCache.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index ce9312b0e4a..20c689de13a 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -7,6 +7,7 @@ #include #include "Common/Common.h" +#include "Common/FileUtil.h" // On disk format: //header{ From 146b301a911dfe0a7ff56a79f10dbbdfab03f066 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 13:09:14 -0500 Subject: [PATCH 15/19] Fix more header sorting issues in Core/ (now check-includes clean). --- Source/Core/Core/ArmMemTools.cpp | 6 +++--- Source/Core/Core/Boot/Boot.cpp | 2 +- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 4 ++-- Source/Core/Core/BootManager.cpp | 6 +++--- Source/Core/Core/ConfigManager.cpp | 2 +- Source/Core/Core/Core.cpp | 7 +++---- Source/Core/Core/Core.h | 2 +- Source/Core/Core/CoreParameter.cpp | 6 +++--- Source/Core/Core/DSP/DSPHWInterface.cpp | 4 ++-- Source/Core/Core/DSP/DSPIntCCUtil.cpp | 2 +- Source/Core/Core/DSP/DSPInterpreter.cpp | 3 +-- Source/Core/Core/DSP/DSPTables.cpp | 2 +- Source/Core/Core/DSP/DspIntArithmetic.cpp | 2 +- Source/Core/Core/DSP/DspIntBranch.cpp | 5 ++--- Source/Core/Core/DSP/DspIntLoadStore.cpp | 3 +-- Source/Core/Core/DSP/DspIntMultiplier.cpp | 3 +-- Source/Core/Core/DSP/assemble.h | 2 +- Source/Core/Core/DSPEmulator.cpp | 2 +- .../Core/Core/Debugger/Debugger_SymbolMap.h | 2 +- .../Core/Core/Debugger/PPCDebugInterface.cpp | 2 +- Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 2 +- Source/Core/Core/HLE/HLE.cpp | 2 +- Source/Core/Core/HLE/HLE_Misc.cpp | 2 +- Source/Core/Core/HW/BBA-TAP/TAP_Win32.h | 2 +- Source/Core/Core/HW/DSPHLE/DSPHLE.cpp | 2 +- .../Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 8 ++++---- .../Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 ++ .../Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp | 2 +- .../Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp | 2 +- .../DSPHLE/UCodes/UCode_InitAudioSystem.cpp | 2 +- .../Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp | 2 +- .../Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp | 2 +- .../HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp | 2 +- .../HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp | 2 +- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 2 +- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h | 2 +- Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 5 +++-- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 2 +- Source/Core/Core/HW/EXI.cpp | 2 +- Source/Core/Core/HW/EXI_Device.cpp | 2 +- Source/Core/Core/HW/GCPad.cpp | 2 +- Source/Core/Core/HW/GPFifo.cpp | 2 +- Source/Core/Core/HW/HW.h | 2 +- Source/Core/Core/HW/Memmap.cpp | 6 +++--- Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp | 2 +- Source/Core/Core/HW/SI_DeviceGBA.cpp | 5 ++--- Source/Core/Core/HW/SystemTimers.cpp | 4 ++-- Source/Core/Core/HW/Wiimote.cpp | 2 +- .../Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp | 2 +- .../Core/HW/WiimoteEmu/EmuSubroutines.cpp | 2 +- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 12 +++++------ Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 5 +---- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 19 +++++++++--------- .../Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 6 +++--- Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 4 ++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 7 +++---- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.h | 3 +-- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 2 +- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp | 2 +- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 2 +- .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 3 +-- Source/Core/Core/Movie.cpp | 2 +- Source/Core/Core/Movie.h | 4 ++-- Source/Core/Core/NetPlayClient.cpp | 20 ++++++++----------- Source/Core/Core/PatchEngine.cpp | 4 ++-- Source/Core/Core/PowerPC/GDBStub.cpp | 9 ++++----- .../Interpreter/Interpreter_LoadStore.cpp | 3 +-- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/Core/PowerPC/Jit64/Jit.h | 2 +- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 7 ++----- Source/Core/Core/PowerPC/Jit64IL/JitIL.h | 6 +++--- Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp | 6 +++--- Source/Core/Core/PowerPC/JitArm32/Jit.cpp | 13 ++++++------ .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 4 +--- Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp | 2 +- .../Core/Core/PowerPC/JitArmIL/JitILAsm.cpp | 2 +- .../Core/PowerPC/JitCommon/JitBackpatch.cpp | 2 +- .../Core/PowerPC/JitCommon/JitBackpatch.h | 2 +- Source/Core/Core/PowerPC/JitCommon/JitBase.h | 4 ++-- .../Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 2 +- Source/Core/Core/PowerPC/JitInterface.cpp | 11 +++++----- Source/Core/Core/PowerPC/PPCCache.cpp | 4 ++-- Source/Core/Core/State.cpp | 2 +- Source/Core/Core/ec_wii.cpp | 2 +- 84 files changed, 152 insertions(+), 173 deletions(-) diff --git a/Source/Core/Core/ArmMemTools.cpp b/Source/Core/Core/ArmMemTools.cpp index 0509db8f88e..29a578e4955 100644 --- a/Source/Core/Core/ArmMemTools.cpp +++ b/Source/Core/Core/ArmMemTools.cpp @@ -3,20 +3,20 @@ // 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/Common.h" #include "Core/MemTools.h" #include "Core/HW/Memmap.h" -#include "Core/PowerPC/PowerPC.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 1cef73ada5c..6c79bd2f21e 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -30,8 +30,8 @@ #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/SignatureDB.h" -#include "DiscIO/VolumeCreator.h" #include "DiscIO/NANDContentLoader.h" +#include "DiscIO/VolumeCreator.h" void CBoot::Load_FST(bool _bIsWii) { diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 678ac06b228..7891a568190 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -15,10 +15,10 @@ #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/HW/DVDInterface.h" -#include "Core/HW/CPU.h" #include "Core/PowerPC/PowerPC.h" #include "DiscIO/VolumeCreator.h" diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 56e9898bed5..7b7820201ff 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -23,10 +23,8 @@ #include #include -#include "DiscIO/Volume.h" -#include "DiscIO/VolumeCreator.h" -#include "Common/CommonTypes.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "Common/SysConf.h" #include "Core/BootManager.h" @@ -38,6 +36,8 @@ #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 2c001787dbb..036e662ee86 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 "DiscIO/NANDContentLoader.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/Core.cpp b/Source/Core/Core/Core.cpp index 4c2eb66b23f..ad3cbd6f8fb 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -9,8 +9,6 @@ #include "AudioCommon/AudioCommon.h" -#include "DiscIO/FileMonitor.h" - #include "Common/Atomic.h" #include "Common/Common.h" #include "Common/CommonPaths.h" @@ -48,14 +46,15 @@ #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" + #ifdef USE_GDBSTUB #include "Core/PowerPC/GDBStub.h" #endif +#include "DiscIO/FileMonitor.h" + #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index 9c60c1b461e..4e750108dcd 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -11,8 +11,8 @@ #pragma once -#include #include +#include #include "Common/CommonTypes.h" #include "Core/CoreParameter.h" diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index f5dd1f95653..4cfec8c7c6d 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -10,9 +10,6 @@ #include "Common/FileUtil.h" #include "Common/StringUtil.h" -#include "DiscIO/NANDContentLoader.h" -#include "DiscIO/VolumeCreator.h" - #include "Core/ConfigManager.h" #include "Core/Core.h" // for bWii #include "Core/CoreParameter.h" @@ -20,6 +17,9 @@ #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/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index a201027b6df..12a01ee3756 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -25,11 +25,11 @@ #include "Common/Atomic.h" #include "Common/CPUDetect.h" -#include "Common/Thread.h" #include "Common/MemoryUtil.h" +#include "Common/Thread.h" -#include "Core/DSP/DSPAnalyzer.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" diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/DSP/DSPIntCCUtil.cpp index ad7f5abc15d..5aa6871839f 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.cpp +++ b/Source/Core/Core/DSP/DSPIntCCUtil.cpp @@ -8,8 +8,8 @@ // HELPER FUNCTIONS #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp index aaae6cd6232..4898dbe9245 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/DSPInterpreter.cpp @@ -26,9 +26,8 @@ #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHWInterface.h" -#include "Core/DSP/DSPTables.h" - #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPTables.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index bef2df15074..bacc0964ad4 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -6,9 +6,9 @@ #include "Common/Common.h" +#include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPIntExtOps.h" -#include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPTables.h" void nop(const UDSPInstruction opc) diff --git a/Source/Core/Core/DSP/DspIntArithmetic.cpp b/Source/Core/Core/DSP/DspIntArithmetic.cpp index f7a82f648a8..95a9665c0c1 100644 --- a/Source/Core/Core/DSP/DspIntArithmetic.cpp +++ b/Source/Core/Core/DSP/DspIntArithmetic.cpp @@ -4,8 +4,8 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPInterpreter.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 78cf972674c..4dd92572fac 100644 --- a/Source/Core/Core/DSP/DspIntBranch.cpp +++ b/Source/Core/Core/DSP/DspIntBranch.cpp @@ -5,13 +5,12 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 #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" -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" - namespace DSPInterpreter { // Generic call implementation diff --git a/Source/Core/Core/DSP/DspIntLoadStore.cpp b/Source/Core/Core/DSP/DspIntLoadStore.cpp index b676479c5e6..43f58508ddb 100644 --- a/Source/Core/Core/DSP/DspIntLoadStore.cpp +++ b/Source/Core/Core/DSP/DspIntLoadStore.cpp @@ -5,9 +5,8 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 #include "Core/DSP/DSPInterpreter.h" -#include "Core/DSP/DSPMemoryMap.h" - #include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/DSPMemoryMap.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DspIntMultiplier.cpp b/Source/Core/Core/DSP/DspIntMultiplier.cpp index 514b87f5373..bff947bdedd 100644 --- a/Source/Core/Core/DSP/DspIntMultiplier.cpp +++ b/Source/Core/Core/DSP/DspIntMultiplier.cpp @@ -7,9 +7,8 @@ // Multiplier and product register control -#include "Core/DSP/DSPInterpreter.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/assemble.h b/Source/Core/Core/DSP/assemble.h index 2011fa783bb..28a9db49817 100644 --- a/Source/Core/Core/DSP/assemble.h +++ b/Source/Core/Core/DSP/assemble.h @@ -24,8 +24,8 @@ #pragma once -#include #include +#include #include "Common/Common.h" diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp index 65e63ea926c..a15f5be6e6d 100644 --- a/Source/Core/Core/DSPEmulator.cpp +++ b/Source/Core/Core/DSPEmulator.cpp @@ -4,8 +4,8 @@ #include "Core/DSPEmulator.h" -#include "Core/HW/DSPLLE/DSPLLE.h" #include "Core/HW/DSPHLE/DSPHLE.h" +#include "Core/HW/DSPLLE/DSPLLE.h" DSPEmulator *CreateDSPEmulator(bool HLE) { diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index d01db6d6056..0388024de91 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "Common/Common.h" diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index ce2ba27b23e..25d344990c0 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -12,8 +12,8 @@ #include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/JitCommon/JitBase.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/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index 3fd73f288db..7f641e91592 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -6,8 +6,8 @@ #include "Core/FifoPlayer/FifoAnalyzer.h" #include "VideoCommon/VertexLoader.h" -#include "VideoCommon/VertexLoader_Position.h" #include "VideoCommon/VertexLoader_Normal.h" +#include "VideoCommon/VertexLoader_Position.h" #include "VideoCommon/VertexLoader_TextCoord.h" namespace FifoAnalyzer diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index 1787246f70f..a8f540d2236 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -8,8 +8,8 @@ #include "Core/Core.h" #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HLE/HLE.h" -#include "Core/HLE/HLE_OS.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" diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index 3bfb88201ea..cb5070260ed 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -18,8 +18,8 @@ #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCCache.h" -#include "Core/PowerPC/SignatureDB.h" #include "Core/PowerPC/PPCSymbolDB.h" +#include "Core/PowerPC/SignatureDB.h" #include "DiscIO/Filesystem.h" #include "DiscIO/VolumeCreator.h" diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h index 2a5bc52ffae..21cfcc71b89 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/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index 39a80ace47e..17838c44281 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -14,8 +14,8 @@ #include "Core/HW/AudioInterface.h" #include "Core/HW/SystemTimers.h" #include "Core/HW/VideoInterface.h" -#include "Core/HW/DSPHLE/HLEMixer.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/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 5a8162e452c..df4550ba126 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -1,6 +1,8 @@ // Copyright 2013 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. +// +#define AX_WII // Used in UCode_AX_Voice. #include "AudioCommon/Mixer.h" #include "Common/MathUtil.h" @@ -8,12 +10,10 @@ #include "Core/HW/DSPHLE/MailHandler.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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" - -#define AX_WII -#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.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_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 3253e94fbdc..6f4c2a490c3 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -17,6 +17,8 @@ #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 diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp index 2ff25c78c4b..9708a90773d 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp @@ -5,8 +5,8 @@ #include "Core/ConfigManager.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/DSPHLE.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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_GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp index f61070245de..e9dd1da116e 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp @@ -4,8 +4,8 @@ #include "Core/ConfigManager.h" #include "Core/HW/DSP.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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_InitAudioSystem.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp index 24bc2029e18..840d284e270 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "Core/ConfigManager.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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_ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp index d6e12f9087f..1a905978a6b 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp @@ -10,8 +10,8 @@ #include "Core/ConfigManager.h" #include "Core/HW/Memmap.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp index a33b546d67f..7c8536ccc07 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp @@ -12,8 +12,8 @@ #include "Core/ConfigManager.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/MailHandler.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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_Synth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp index 2f90d967bf6..1ae76d2af89 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp @@ -7,8 +7,8 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/Mixer.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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 ccc029891ea..bd503baebd4 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -10,8 +10,8 @@ #include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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 82f9e3bb35f..4dad9783b00 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -8,7 +8,6 @@ #include "Common/Hash.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.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" @@ -16,6 +15,7 @@ #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 2413c08e58e..73bf8795fbf 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -4,8 +4,8 @@ #pragma once -#include "Common/Common.h" #include "Common/ChunkFile.h" +#include "Common/Common.h" #include "Common/Thread.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index c29a3e9d7ca..cf49032fe19 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -4,14 +4,15 @@ #include "Common/Common.h" #include "Common/Hash.h" -#include "Core/Host.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/DSPSymbols.h" #include "Core/HW/DSPLLE/DSPLLETools.h" +#include "Core/HW/DSPLLE/DSPSymbols.h" #include "Core/PowerPC/PowerPC.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index b891bec5033..7f9a926352c 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -20,8 +20,8 @@ #include "Core/DSP/disassemble.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPInterpreter.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" diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index b4048c76f4d..b5492ac3be5 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" #include "Common/ChunkFile.h" +#include "Common/Common.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index e19ceabf42d..86833c270d2 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "Core/Core.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" diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp index 4c3b1aa2103..8c17a3d4dfa 100644 --- a/Source/Core/Core/HW/GCPad.cpp +++ b/Source/Core/Core/HW/GCPad.cpp @@ -8,8 +8,8 @@ #include "Core/HW/GCPadEmu.h" #include "InputCommon/GCPadStatus.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/InputConfig.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" namespace Pad diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp index 1aafdf36cbc..512fea8ab93 100644 --- a/Source/Core/Core/HW/GPFifo.cpp +++ b/Source/Core/Core/HW/GPFifo.cpp @@ -8,8 +8,8 @@ #include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" #include "Core/HW/ProcessorInterface.h" -#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h index 684d25c5951..c01ec7b52d2 100644 --- a/Source/Core/Core/HW/HW.h +++ b/Source/Core/Core/HW/HW.h @@ -4,8 +4,8 @@ #pragma once -#include "Common/Common.h" #include "Common/ChunkFile.h" +#include "Common/Common.h" namespace HW { diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index fa569618d26..ca57d24f44f 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -13,8 +13,8 @@ #include "Common/MemArena.h" #include "Common/MemoryUtil.h" -#include "Core/Core.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" @@ -23,13 +23,13 @@ #include "Core/HW/DVDInterface.h" #include "Core/HW/EXI.h" #include "Core/HW/GPFifo.h" -#include "Core/HW/MemoryInterface.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/WII_IPC.h" #include "Core/HW/VideoInterface.h" +#include "Core/HW/WII_IPC.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/JitCommon/JitBase.h" diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp index 49f3f6078e9..4729d3a678e 100644 --- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp @@ -2,11 +2,11 @@ // 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 "Core/HW/GCPad.h" #include "InputCommon/GCPadStatus.h" // where to put baseboard debug diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp index 0e83744f6f7..93a73650bb8 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp @@ -4,13 +4,12 @@ #include -#include "SFML/Network.hpp" - #include "Common/Thread.h" - #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceGBA.h" +#include "SFML/Network.hpp" + static std::thread connectionThread; static std::queue waiting_socks; static std::mutex cs_gba; diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index d6fe5e69a39..4e51ba85850 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -61,8 +61,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: #include "Common/Thread.h" #include "Common/Timer.h" -#include "Core/CoreTiming.h" #include "Core/ConfigManager.h" +#include "Core/CoreTiming.h" #include "Core/DSPEmulator.h" #include "Core/Host.h" #include "Core/PatchEngine.h" @@ -72,8 +72,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: #include "Core/HW/SI.h" #include "Core/HW/SystemTimers.h" #include "Core/HW/VideoInterface.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/PowerPC/PowerPC.h" #include "VideoCommon/CommandProcessor.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index 94a359af500..f93aa1c9e82 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -10,8 +10,8 @@ #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/InputConfig.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" namespace Wiimote { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp index 6f57548f451..d306c111c38 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp @@ -4,8 +4,8 @@ #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" -#include "InputCommon/UDPWrapper.h" #include "InputCommon/UDPWiimote.h" +#include "InputCommon/UDPWrapper.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index 255833e57f2..0a56b60b2b1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -25,8 +25,8 @@ #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteEmu/Attachment/Attachment.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index efe5274b03f..520dd4119d7 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -7,23 +7,23 @@ #include "Common/Common.h" #include "Common/Timer.h" -#include "Core/Host.h" #include "Core/ConfigManager.h" +#include "Core/Host.h" #include "Core/Movie.h" #include "Core/NetPlayClient.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/WiimoteEmu/MatrixMath.h" -#include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "Core/HW/WiimoteEmu/WiimoteHid.h" -#include "Core/HW/WiimoteEmu/UDPTLayer.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" + inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } //because damn MSVSC doesen't comply to C99 namespace diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 49714cb6bba..99979efb69c 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -7,13 +7,10 @@ #include #include -#include "Core/Core.h" - #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" diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index e9244287896..d580126a6b2 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -2,28 +2,27 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +// Used for pair up +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WINXPSP2 + #include +#include +#include #include #include #include -#include -#include - -#include #include #include +#include +#include +#include #include "Common/Common.h" #include "Common/StringUtil.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" -// Used for pair up -#undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WINXPSP2 -#include -#include - //#define AUTHENTICATE_WIIMOTES #define SHARE_WRITE_WIIMOTES diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 99db68ba4de..b185f625493 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -6,8 +6,6 @@ #include #include -#include "SFML/Network.hpp" - #include "Common/Common.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" @@ -15,8 +13,10 @@ #include "Core/ConfigManager.h" #include "Core/Host.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" + +#include "SFML/Network.hpp" unsigned int g_wiimote_sources[MAX_BBMOTES]; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index a26ebfc00ea..fadd41422d6 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -20,13 +20,13 @@ 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/Common.h" #include "Common/CommonPaths.h" -#include "Common/FileUtil.h" // For Copy +#include "Common/FileUtil.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" 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 ebeb0cf531f..90f586414c5 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,8 +33,6 @@ */ // ============= -#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" - // need to include this before polarssl/aes.h, // otherwise we may not get __STDC_FORMAT_MACROS #include @@ -47,12 +45,13 @@ #include "Common/StringUtil.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/PowerPC/PowerPC.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "Core/ec_wii.h" +#include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 #include 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 89fb6c85b86..c3d3f53580b 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,9 +4,8 @@ #pragma once -#include - #include +#include #include "Common/Thread.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" 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 6b8f2241400..80e87eafba0 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,9 +4,9 @@ #pragma once +#include #include #include -#include #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" 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 985927aa205..25e4f8283b9 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 @@ -5,8 +5,8 @@ #include "Common/Common.h" #include "Common/SDCardUtil.h" -#include "Core/Core.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" 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 22e18386baa..bcc83c80787 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 @@ -9,8 +9,8 @@ #include "Core/Movie.h" #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/SystemTimers.h" -#include "Core/HW/Wiimote.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" 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 da50bc3cb6b..9eb3b778b18 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -9,12 +9,11 @@ #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" -#include "Core/IPC_HLE/l2cap.h" // Local - static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer() diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 242ac4e9334..67b14fb131f 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "polarssl/md5.h" +#include #include "Common/FileUtil.h" #include "Common/NandPaths.h" diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index d8709d53597..391449ddfd4 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -4,13 +4,13 @@ #pragma once +#include + #include "Common/ChunkFile.h" #include "Common/Common.h" #include "InputCommon/GCPadStatus.h" -#include - namespace WiimoteEmu { struct ReportFeatures; diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index a77c7f5dd94..d60eb49259a 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 "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Movie.h" #include "Core/NetPlayClient.h" - -// for wiimote -#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 gcpad +#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" -// for gctime -#include "Core/HW/EXI_DeviceIPL.h" -// for wiimote/ OSD messages -#include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Movie.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" + std::mutex crit_netplay_client; static NetPlayClient * netplay_client = NULL; diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index 8c14111beb8..5882fef75f2 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -15,10 +15,10 @@ // [OnLoad] // 0x80020394=dword,0x4e800020 +#include +#include #include #include -#include -#include #include "Common/CommonPaths.h" #include "Common/FileUtil.h" diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index 06d40a1086b..d73573c9ddd 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -4,11 +4,10 @@ // Originally written by Sven Peter for anergistic. -#include "Core/PowerPC/GDBStub.h" - +#include +#include #include #include -#include #include #ifdef _WIN32 #include @@ -19,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/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 514a9a4a807..46013597fcb 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -5,11 +5,10 @@ #include "Common/Common.h" #include "Common/MathUtil.h" +#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" -#include "Core/PowerPC/JitInterface.h" - bool Interpreter::g_bReserve; u32 Interpreter::g_reserveAddr; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index cee8fc2c831..e34ab8c6ae2 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -15,9 +15,9 @@ #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" -#include "Core/PowerPC/Jit64/Jit64_Tables.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 1387fd546e7..b1c9d0ef456 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -32,10 +32,10 @@ #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" -#include "Core/PowerPC/JitCommon/Jit_Util.h" class Jit64 : public Jitx86Base { diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index c3ed548a892..d24b0582180 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include // For profiling #include #include @@ -11,8 +12,8 @@ #include "Core/HLE/HLE.h" #include "Core/PowerPC/Profiler.h" #include "Core/PowerPC/Jit64IL/JitIL.h" -#include "Core/PowerPC/Jit64IL/JitILAsm.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 9ed2a354a37..146f905f730 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h @@ -23,18 +23,18 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/HW/Memmap.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/JitCommon/Jit_Util.h" -#include "Core/PowerPC/JitILCommon/JitILBase.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 cb28dd42c56..79ea71a811c 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64IL/JitIL.h" -#include "Core/PowerPC/Jit64IL/JitILAsm.h" - #include "Common/CPUDetect.h" #include "Common/MemoryUtil.h" +#include "Core/PowerPC/Jit64IL/JitIL.h" +#include "Core/PowerPC/Jit64IL/JitILAsm.h" + using namespace Gen; //static int temp32; // unused? diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index cb62c023e0f..3c4cdf6ca54 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -4,20 +4,21 @@ #include -#include "Common/Common.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/PowerPC/JitInterface.h" -#include "Core/PowerPC/PPCAnalyst.h" -#include "Core/PowerPC/PPCTables.h" -#include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/Profiler.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" diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp index 16d13a69415..a66cdbed8b5 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -11,12 +11,10 @@ #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCTables.h" -#include "Core/PowerPC/JitArm32/JitArm_FPUtils.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/JitArm_FPUtils.h" #include "Core/PowerPC/JitArm32/JitRegCache.h" void JitArm::Helper_UpdateCR1(ARMReg fpscr, ARMReg temp) diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp index 00c51eca19a..ed7a39cbf4f 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp @@ -4,8 +4,8 @@ #include -#include "Common/Common.h" #include "Common/ArmEmitter.h" +#include "Common/Common.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp index ab2c92db9ac..be7c34f5d8d 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp @@ -10,9 +10,9 @@ #include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/JitCommon/JitCache.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/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp index 79469a5f792..f99bfc65a5a 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp @@ -9,8 +9,8 @@ #include "Common/Common.h" #include "Common/StringUtil.h" -#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/JitBackpatch.h" +#include "Core/PowerPC/JitCommon/JitBase.h" #ifdef _WIN32 #include diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h index 38f142bed31..44cdfa00d0f 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h @@ -5,8 +5,8 @@ #pragma once #include "Common/Common.h" -#include "Common/x64Emitter.h" #include "Common/x64Analyzer.h" +#include "Common/x64Emitter.h" // meh. #if defined(_WIN32) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index 55e5fe67981..fde07500179 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -22,10 +22,10 @@ #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" // for EmuCodeBlock +#include "Core/PowerPC/JitCommon/JitBackpatch.h" #include "Core/PowerPC/JitCommon/JitCache.h" -#include "Core/PowerPC/JitCommon/Jit_Util.h" // for EmuCodeBlock // Use these to control the instruction selection // #define INSTRUCTION_START Default(inst); return; diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index 7475f4431cc..ec03303a971 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -5,8 +5,8 @@ #include "Common/Common.h" #include "Common/CPUDetect.h" -#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/Jit_Util.h" +#include "Core/PowerPC/JitCommon/JitBase.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 54a82d92458..6527093ea94 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -9,8 +9,12 @@ #include #endif -#include "Core/PowerPC/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 "Core/PowerPC/Jit64/Jit.h" @@ -26,11 +30,6 @@ #include "Core/PowerPC/JitArmIL/JitIL_Tables.h" #endif -#include "Core/ConfigManager.h" -#include "Core/HW/Memmap.h" -#include "Core/PowerPC/Profiler.h" -#include "Core/PowerPC/PPCSymbolDB.h" - bool bFakeVMEM = false; bool bMMU = false; diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 976435ef5ff..3ccd6f683f4 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -3,11 +3,11 @@ // Refer to the license.txt file included. #include "Core/HW/Memmap.h" -#include "Core/PowerPC/PPCCache.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" -#include "Core/PowerPC/JitInterface.h" namespace PowerPC { diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 3d8f3d5c0c7..a1eecd33126 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -9,8 +9,8 @@ #include "Common/Thread.h" #include "Common/Timer.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" #include "Core/State.h" diff --git a/Source/Core/Core/ec_wii.cpp b/Source/Core/Core/ec_wii.cpp index bb858a987bd..d89e17f71d9 100644 --- a/Source/Core/Core/ec_wii.cpp +++ b/Source/Core/Core/ec_wii.cpp @@ -10,7 +10,7 @@ #include #include -#include "polarssl/sha1.h" +#include #include "Common/FileUtil.h" #include "Common/Crypto/tools.h" From 91286f5021e1e0c6ea4a4b38637e5de77fffc7a0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 13:46:47 -0500 Subject: [PATCH 16/19] Fix the Windows build in relation to the recent changes. --- Source/Core/Common/CommonFuncs.h | 3 ++- .../InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index dba3a63bcba..ab683221b38 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/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/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index b524f1f0f46..e98c13df88d 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include From ed9eea72a1d6a34215ef78f2b5e4e0d431c58144 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 13:52:31 -0500 Subject: [PATCH 17/19] Forgot to move DSPTool over. Fixed now. --- Source/DSPTool/DSPTool.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/DSPTool/DSPTool.cpp b/Source/DSPTool/DSPTool.cpp index 5a776be5587..a81e95178cb 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; } From c1a934f7ed260ffb0ce78d30692275736df79cfd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 14:09:06 -0500 Subject: [PATCH 18/19] Fix the Android build. Required the removal of EGL.h from EGL.cpp. Removed the similar includes from AGL.cpp, GLX.cpp, and WGL.cpp to retain consistency. All GL interfaces are now centralized on GLInterface.h --- Source/Core/DolphinWX/GLInterface/AGL.cpp | 1 - Source/Core/DolphinWX/GLInterface/EGL.cpp | 1 - Source/Core/DolphinWX/GLInterface/GLX.cpp | 1 - Source/Core/DolphinWX/GLInterface/WGL.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index b8e157d8195..09724de80ca 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -7,7 +7,6 @@ #include "Core/ConfigManager.h" #include "Core/Host.h" -#include "DolphinWX/GLInterface/AGL.h" #include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 1e75df1c801..6a25aa4411c 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "Core/Host.h" -#include "DolphinWX/GLInterface/EGL.h" #include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index 04ac37086a6..ea220d88766 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -5,7 +5,6 @@ #include "Core/Host.h" #include "DolphinWX/GLInterface/GLInterface.h" -#include "DolphinWX/GLInterface/GLX.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp index 15b9e41c2cf..5de14681132 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -5,7 +5,6 @@ #include "Core/Host.h" #include "DolphinWX/GLInterface/GLInterface.h" -#include "DolphinWX/GLInterface/WGL.h" #include "VideoCommon/EmuWindow.h" #include "VideoCommon/RenderBase.h" From 24ba058404d8036a977a41e55c58a7326302cb34 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 19 Feb 2014 19:38:23 -0500 Subject: [PATCH 19/19] Fix the Windows build for the final time. --- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index d580126a6b2..f306465b017 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -7,16 +7,16 @@ #define NTDDI_VERSION NTDDI_WINXPSP2 #include -#include -#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"