diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index 03a477a490..cf1377ae62 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "IopCommon.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include #include diff --git a/pcsx2/CDVD/CDVDaccess.cpp b/pcsx2/CDVD/CDVDaccess.cpp index eefa50d602..7a97755b51 100644 --- a/pcsx2/CDVD/CDVDaccess.cpp +++ b/pcsx2/CDVD/CDVDaccess.cpp @@ -34,7 +34,7 @@ #include "CDVDisoReader.h" #include "DebugTools/SymbolMap.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" CDVD_API* CDVD = NULL; diff --git a/pcsx2/CDVD/CDVDdiscReader.cpp b/pcsx2/CDVD/CDVDdiscReader.cpp index 9cee54049c..549867a0fd 100644 --- a/pcsx2/CDVD/CDVDdiscReader.cpp +++ b/pcsx2/CDVD/CDVDdiscReader.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "CDVDdiscReader.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include diff --git a/pcsx2/CDVD/GzippedFileReader.cpp b/pcsx2/CDVD/GzippedFileReader.cpp index e2f5a5f2d0..9fff424e05 100644 --- a/pcsx2/CDVD/GzippedFileReader.cpp +++ b/pcsx2/CDVD/GzippedFileReader.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include #include -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "ChunksCache.h" #include "CompressedFileReaderUtils.h" #include "GzippedFileReader.h" diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 8331e36683..437a7b87d9 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1515,9 +1515,8 @@ endforeach() # additonal include directories target_include_directories(PCSX2 PRIVATE . - gui x86 - ${CMAKE_BINARY_DIR}/pcsx2/gui + ${CMAKE_BINARY_DIR}/pcsx2 ${CMAKE_BINARY_DIR}/common/include/ "${CMAKE_SOURCE_DIR}/3rdparty/jpgd/" "${CMAKE_SOURCE_DIR}/3rdparty/xbyak/" diff --git a/pcsx2/Counters.cpp b/pcsx2/Counters.cpp index 038dbd6a86..ac6cc28f27 100644 --- a/pcsx2/Counters.cpp +++ b/pcsx2/Counters.cpp @@ -19,7 +19,7 @@ #include #include -#include "App.h" +#include "gui/App.h" #include "Common.h" #include "R3000A.h" #include "Counters.h" diff --git a/pcsx2/Counters.h b/pcsx2/Counters.h index 711590424e..6580dab2c0 100644 --- a/pcsx2/Counters.h +++ b/pcsx2/Counters.h @@ -15,6 +15,8 @@ #pragma once +#include "MemoryTypes.h" + struct EECNT_MODE { // 0 - BUSCLK diff --git a/pcsx2/DEV9/DEV9.cpp b/pcsx2/DEV9/DEV9.cpp index 78c87ed174..5fe83535e6 100644 --- a/pcsx2/DEV9/DEV9.cpp +++ b/pcsx2/DEV9/DEV9.cpp @@ -36,7 +36,7 @@ #include "DEV9.h" #undef EXTERN #include "Config.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "smap.h" diff --git a/pcsx2/DEV9/Linux/Config.cpp b/pcsx2/DEV9/Linux/Config.cpp index 84548eef89..121929ed87 100644 --- a/pcsx2/DEV9/Linux/Config.cpp +++ b/pcsx2/DEV9/Linux/Config.cpp @@ -19,7 +19,7 @@ #include #include "DEV9/DEV9.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include #include diff --git a/pcsx2/DEV9/Linux/Linux.cpp b/pcsx2/DEV9/Linux/Linux.cpp index cf8a7b9862..cb087f5b4a 100644 --- a/pcsx2/DEV9/Linux/Linux.cpp +++ b/pcsx2/DEV9/Linux/Linux.cpp @@ -36,7 +36,7 @@ #include "DEV9/pcap_io.h" #include "DEV9/net.h" #include "DEV9/PacketReader/IP/IP_Address.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "DEV9/ATA/HddCreate.h" diff --git a/pcsx2/DEV9/Win32/DEV9WinConfig.cpp b/pcsx2/DEV9/Win32/DEV9WinConfig.cpp index 5a9e737974..6648f306f2 100644 --- a/pcsx2/DEV9/Win32/DEV9WinConfig.cpp +++ b/pcsx2/DEV9/Win32/DEV9WinConfig.cpp @@ -19,8 +19,8 @@ #include -#include "..\DEV9.h" -#include "AppConfig.h" +#include "DEV9/DEV9.h" +#include "gui/AppConfig.h" #include "ws2tcpip.h" diff --git a/pcsx2/DEV9/Win32/Win32.cpp b/pcsx2/DEV9/Win32/Win32.cpp index d4770946ec..640de8fccb 100644 --- a/pcsx2/DEV9/Win32/Win32.cpp +++ b/pcsx2/DEV9/Win32/Win32.cpp @@ -29,7 +29,7 @@ #include "DEV9/net.h" #include "DEV9/PacketReader\IP\IP_Address.h" #include "tap.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "DEV9/ATA/HddCreate.h" diff --git a/pcsx2/DebugTools/Breakpoints.cpp b/pcsx2/DebugTools/Breakpoints.cpp index 605a71f7c2..c047f1aae8 100644 --- a/pcsx2/DebugTools/Breakpoints.cpp +++ b/pcsx2/DebugTools/Breakpoints.cpp @@ -408,8 +408,8 @@ const std::vector CBreakPoints::GetBreakpoints() } // including them earlier causes some ambiguities -#include "App.h" -#include "Debugger/DisassemblyDialog.h" +#include "gui/App.h" +#include "gui/Debugger/DisassemblyDialog.h" void CBreakPoints::Update(BreakPointCpu cpu, u32 addr) { diff --git a/pcsx2/DebugTools/DebugInterface.cpp b/pcsx2/DebugTools/DebugInterface.cpp index f1ffa57955..1874f4541a 100644 --- a/pcsx2/DebugTools/DebugInterface.cpp +++ b/pcsx2/DebugTools/DebugInterface.cpp @@ -18,7 +18,7 @@ #include "DebugInterface.h" #include "Memory.h" #include "R5900.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "Debug.h" #include "VU.h" #include "GS.h" // Required for gsNonMirroredRead() diff --git a/pcsx2/Dump.cpp b/pcsx2/Dump.cpp index 0713557b3f..038ea64476 100644 --- a/pcsx2/Dump.cpp +++ b/pcsx2/Dump.cpp @@ -22,7 +22,7 @@ #include "IPU/IPU.h" #include "DebugTools/SymbolMap.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "Utilities/AsciiFile.h" using namespace R5900; diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp index 7503eaffc3..61439063b2 100644 --- a/pcsx2/Elfheader.cpp +++ b/pcsx2/Elfheader.cpp @@ -19,7 +19,7 @@ #include "GS.h" // for sending game crc to mtgs #include "Elfheader.h" #include "DebugTools/SymbolMap.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" u32 ElfCRC; u32 ElfEntry; diff --git a/pcsx2/GS.cpp b/pcsx2/GS.cpp index 49fae78e9d..69452512a5 100644 --- a/pcsx2/GS.cpp +++ b/pcsx2/GS.cpp @@ -21,7 +21,7 @@ #include "GS.h" #include "Gif_Unit.h" #include "Counters.h" -#include "GSFrame.h" +#include "gui/GSFrame.h" using namespace Threading; using namespace R5900; diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index 637afaf852..84b0fb2469 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -23,7 +23,7 @@ #include "Renderers/OpenGL/GSRendererOGL.h" #include "GSLzma.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "common/pxStreams.h" #ifdef _WIN32 diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index 67ca0f276b..b3a39ffa15 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -26,8 +26,6 @@ #include "SPU2/spu2.h" #include "R3000A.h" -#include "ConsoleLogger.h" - using namespace R5900; // Shift the middle 8 bits (bits 4-12) into the lower 8 bits. diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index 8f5177921b..6a2048b3e7 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -22,7 +22,7 @@ #include "mpeg2lib/Mpeg.h" #include -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "common/MemsetFast.inl" diff --git a/pcsx2/Linux/LnxConsolePipe.cpp b/pcsx2/Linux/LnxConsolePipe.cpp index a8e2b98059..4a3ebcb8d7 100644 --- a/pcsx2/Linux/LnxConsolePipe.cpp +++ b/pcsx2/Linux/LnxConsolePipe.cpp @@ -15,8 +15,8 @@ #include "PrecompiledHeader.h" -#include "App.h" -#include "ConsoleLogger.h" +#include "gui/App.h" +#include "gui/ConsoleLogger.h" #include using namespace Threading; diff --git a/pcsx2/Linux/LnxKeyCodes.cpp b/pcsx2/Linux/LnxKeyCodes.cpp index 5a2a834884..300857cabc 100644 --- a/pcsx2/Linux/LnxKeyCodes.cpp +++ b/pcsx2/Linux/LnxKeyCodes.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "ConsoleLogger.h" +#include "gui/ConsoleLogger.h" #include diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp index 2beff0a6fb..4c613bb8d1 100644 --- a/pcsx2/MTGS.cpp +++ b/pcsx2/MTGS.cpp @@ -23,7 +23,6 @@ #include "Gif_Unit.h" #include "MTVU.h" #include "Elfheader.h" -#include "App.h" #include "gui/Dialogs/ModalPopups.h" #ifdef _WIN32 #include "PAD/Windows/PAD.h" diff --git a/pcsx2/PAD/Linux/Config.cpp b/pcsx2/PAD/Linux/Config.cpp index ee9fd018e9..e778cc54d2 100644 --- a/pcsx2/PAD/Linux/Config.cpp +++ b/pcsx2/PAD/Linux/Config.cpp @@ -13,10 +13,10 @@ * If not, see . */ +#include "gui/AppConfig.h" #include "Global.h" #include "Device.h" #include "keyboard.h" -#include "AppConfig.h" #ifdef __APPLE__ #include #endif diff --git a/pcsx2/PAD/Linux/Global.h b/pcsx2/PAD/Linux/Global.h index 3c722c63b9..4b7702ff9e 100644 --- a/pcsx2/PAD/Linux/Global.h +++ b/pcsx2/PAD/Linux/Global.h @@ -30,8 +30,8 @@ #include "common/pxStreams.h" #include "common/Console.h" -#include "App.h" #include "DebugTools/Debug.h" +#include "gui/App.h" #define PADdefs diff --git a/pcsx2/PAD/Linux/keyboard.h b/pcsx2/PAD/Linux/keyboard.h index 26b94eae8b..fbe632d5b5 100644 --- a/pcsx2/PAD/Linux/keyboard.h +++ b/pcsx2/PAD/Linux/keyboard.h @@ -16,7 +16,7 @@ #pragma once #include "common/Pcsx2Defs.h" -#include "App.h" +#include "gui/App.h" #if defined(__unix__) || defined(__APPLE__) diff --git a/pcsx2/PAD/Linux/linux.cpp b/pcsx2/PAD/Linux/linux.cpp index 3f67c8d1f0..8f3b557ea0 100644 --- a/pcsx2/PAD/Linux/linux.cpp +++ b/pcsx2/PAD/Linux/linux.cpp @@ -13,8 +13,8 @@ * If not, see . */ +#include "gui/AppCoreThread.h" #include "Global.h" -#include "AppCoreThread.h" #include "Device.h" #include "keyboard.h" #include "state_management.h" diff --git a/pcsx2/PAD/Windows/PAD.h b/pcsx2/PAD/Windows/PAD.h index dbc385b120..ecb49fb925 100644 --- a/pcsx2/PAD/Windows/PAD.h +++ b/pcsx2/PAD/Windows/PAD.h @@ -33,7 +33,7 @@ #include #include -#include "App.h" +#include "gui/App.h" #include "SaveState.h" typedef struct diff --git a/pcsx2/PAD/Windows/PADConfig.cpp b/pcsx2/PAD/Windows/PADConfig.cpp index 6f4255e5b8..a5a6c171a8 100644 --- a/pcsx2/PAD/Windows/PADConfig.cpp +++ b/pcsx2/PAD/Windows/PADConfig.cpp @@ -30,7 +30,7 @@ // Needed to know if raw input is available. It requires XP or higher. #include "PADRawInput.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" //max len 24 wchar_t const wchar_t* padTypes[] = { diff --git a/pcsx2/Patch.h b/pcsx2/Patch.h index bfd7efcdd1..8c072fadd7 100644 --- a/pcsx2/Patch.h +++ b/pcsx2/Patch.h @@ -37,7 +37,7 @@ #include "common/Pcsx2Defs.h" #include "SysForwardDefs.h" -#include "AppGameDatabase.h" +#include "gui/AppGameDatabase.h" enum patch_cpu_type { NO_CPU, diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h index e92e68f8cf..3dd9f81e2c 100644 --- a/pcsx2/PrecompiledHeader.h +++ b/pcsx2/PrecompiledHeader.h @@ -68,7 +68,7 @@ // need a full recompile anyway, when modified (etc) #include "common/Pcsx2Defs.h" -#include "i18n.h" +#include "gui/i18n.h" #include "common/wxBaseTools.h" #include "common/Path.h" diff --git a/pcsx2/R3000AInterpreter.cpp b/pcsx2/R3000AInterpreter.cpp index 31ea6c6ddf..2f84078efa 100644 --- a/pcsx2/R3000AInterpreter.cpp +++ b/pcsx2/R3000AInterpreter.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "IopCommon.h" -#include "App.h" // For host irx injection hack +#include "gui/App.h" // For host irx injection hack #include "R5900OpcodeTables.h" #include "DebugTools/Breakpoints.h" diff --git a/pcsx2/Recording/InputRecording.cpp b/pcsx2/Recording/InputRecording.cpp index 88a4745598..65a86bbee8 100644 --- a/pcsx2/Recording/InputRecording.cpp +++ b/pcsx2/Recording/InputRecording.cpp @@ -15,18 +15,20 @@ #include "PrecompiledHeader.h" -#include "AppSaveStates.h" +#include "gui/AppSaveStates.h" #include "Counters.h" #ifndef DISABLE_RECORDING -#include "AppGameDatabase.h" +#include "gui/AppGameDatabase.h" #include "DebugTools/Debug.h" #include "InputRecording.h" #include "InputRecordingControls.h" #include "Utilities/InputRecordingLogger.h" +#include + #endif void SaveStateBase::InputRecordingFreeze() diff --git a/pcsx2/Recording/InputRecordingControls.cpp b/pcsx2/Recording/InputRecordingControls.cpp index ddb68af034..5b33b18700 100644 --- a/pcsx2/Recording/InputRecordingControls.cpp +++ b/pcsx2/Recording/InputRecordingControls.cpp @@ -17,11 +17,11 @@ #ifndef DISABLE_RECORDING -#include "App.h" #include "Counters.h" #include "DebugTools/Debug.h" -#include "MainFrame.h" #include "MemoryTypes.h" +#include "gui/App.h" +#include "gui/MainFrame.h" #include "InputRecording.h" #include "InputRecordingControls.h" diff --git a/pcsx2/Recording/InputRecordingFile.cpp b/pcsx2/Recording/InputRecordingFile.cpp index 81bcfa828d..2904b7d383 100644 --- a/pcsx2/Recording/InputRecordingFile.cpp +++ b/pcsx2/Recording/InputRecordingFile.cpp @@ -18,12 +18,14 @@ #ifndef DISABLE_RECORDING #include "DebugTools/Debug.h" -#include "MainFrame.h" +#include "gui/MainFrame.h" #include "MemoryTypes.h" #include "InputRecordingFile.h" #include "Utilities/InputRecordingLogger.h" +#include + void InputRecordingFileHeader::Init() { memset(author, 0, ArraySize(author)); diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp index 0619301546..58e72cda5f 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp @@ -17,6 +17,14 @@ #include "InputRecordingLogger.h" +#include "DebugTools/Debug.h" +#include "common/Console.h" +#include "GS.h" // GSosdlog +#include "gui/App.h" // GetRGBA +#include "gui/ConsoleLogger.h" + +#include + namespace inputRec { void log(const std::string& log) diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.h b/pcsx2/Recording/Utilities/InputRecordingLogger.h index 07fc53d4be..f0bb209f80 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.h +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.h @@ -15,13 +15,6 @@ #pragma once -#include "App.h" -#include "ConsoleLogger.h" -#include "DebugTools/Debug.h" -#include "common/Console.h" - -#include - #include #include #include diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.cpp b/pcsx2/Recording/VirtualPad/VirtualPad.cpp index 3910c59c0f..20c78e45a8 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.cpp +++ b/pcsx2/Recording/VirtualPad/VirtualPad.cpp @@ -19,8 +19,8 @@ #include -#include "App.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/MSWstuff.h" #include "common/EmbeddedImage.h" #include "wx/dcbuffer.h" #include "wx/display.h" diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.h b/pcsx2/Recording/VirtualPad/VirtualPad.h index 1f57e19107..5d9772fde4 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.h +++ b/pcsx2/Recording/VirtualPad/VirtualPad.h @@ -20,7 +20,7 @@ #include #include -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "common/Pcsx2Types.h" #include "wx/checkbox.h" diff --git a/pcsx2/SPU2/Linux/CfgHelpers.cpp b/pcsx2/SPU2/Linux/CfgHelpers.cpp index 762523bea7..ab0c10437a 100644 --- a/pcsx2/SPU2/Linux/CfgHelpers.cpp +++ b/pcsx2/SPU2/Linux/CfgHelpers.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "Dialogs.h" #include diff --git a/pcsx2/SPU2/Windows/CfgHelpers.cpp b/pcsx2/SPU2/Windows/CfgHelpers.cpp index bd1d73da5c..a959f58d52 100644 --- a/pcsx2/SPU2/Windows/CfgHelpers.cpp +++ b/pcsx2/SPU2/Windows/CfgHelpers.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "SPU2/Global.h" #include "Dialogs.h" diff --git a/pcsx2/SPU2/spu2.cpp b/pcsx2/SPU2/spu2.cpp index d7591b3a4c..ee6c863636 100644 --- a/pcsx2/SPU2/spu2.cpp +++ b/pcsx2/SPU2/spu2.cpp @@ -25,7 +25,7 @@ #endif #include "R3000A.h" #include "common/pxStreams.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" using namespace Threading; diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index 1465a2f16f..0ec41a4993 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -23,7 +23,7 @@ #include "VUmicro.h" #include "MTVU.h" #include "Cache.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "Elfheader.h" #include "Counters.h" diff --git a/pcsx2/Sio.cpp b/pcsx2/Sio.cpp index b3743710d3..ab5dd87848 100644 --- a/pcsx2/Sio.cpp +++ b/pcsx2/Sio.cpp @@ -17,7 +17,6 @@ #include "IopCommon.h" #include "Common.h" -#include "ConsoleLogger.h" #include "Sio.h" #include "sio_internal.h" #ifdef _WIN32 diff --git a/pcsx2/Sio.h b/pcsx2/Sio.h index 8d03c6e737..34873bb8b9 100644 --- a/pcsx2/Sio.h +++ b/pcsx2/Sio.h @@ -15,7 +15,7 @@ #pragma once -#include "MemoryCardFile.h" +#include "gui/MemoryCardFile.h" struct _mcd { diff --git a/pcsx2/USB/Win32/Config_usb.cpp b/pcsx2/USB/Win32/Config_usb.cpp index 94d88451fc..4c57fad3ac 100644 --- a/pcsx2/USB/Win32/Config_usb.cpp +++ b/pcsx2/USB/Win32/Config_usb.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "USB/USB.h" #include "resource_usb.h" #include "Config_usb.h" diff --git a/pcsx2/USB/configuration.cpp b/pcsx2/USB/configuration.cpp index 763213ebf0..fd6cc76de1 100644 --- a/pcsx2/USB/configuration.cpp +++ b/pcsx2/USB/configuration.cpp @@ -18,7 +18,7 @@ #include "configuration.h" #include "shared/inifile_usb.h" #include "platcompat.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include #include diff --git a/pcsx2/USB/linux/config-gtk.cpp b/pcsx2/USB/linux/config-gtk.cpp index 176e4f9841..66bb39b3eb 100644 --- a/pcsx2/USB/linux/config-gtk.cpp +++ b/pcsx2/USB/linux/config-gtk.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "USB/gtk.h" #include "USB/configuration.h" diff --git a/pcsx2/ZipTools/thread_gzip.cpp b/pcsx2/ZipTools/thread_gzip.cpp index 466ff46022..bc2a7d4001 100644 --- a/pcsx2/ZipTools/thread_gzip.cpp +++ b/pcsx2/ZipTools/thread_gzip.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "SaveState.h" #include "ThreadedZipTools.h" #include "common/SafeArray.inl" diff --git a/pcsx2/gui/AppRes.cpp b/pcsx2/gui/AppRes.cpp index d9b3b1842e..4c741e0734 100644 --- a/pcsx2/gui/AppRes.cpp +++ b/pcsx2/gui/AppRes.cpp @@ -25,19 +25,19 @@ #include "MSWstuff.h" #include "common/EmbeddedImage.h" -#include "Resources/BackgroundLogo.h" -#include "Resources/ButtonIcon_Camera.h" +#include "gui/Resources/BackgroundLogo.h" +#include "gui/Resources/ButtonIcon_Camera.h" -#include "Resources/ConfigIcon_Cpu.h" -#include "Resources/ConfigIcon_Video.h" -#include "Resources/ConfigIcon_Speedhacks.h" -#include "Resources/ConfigIcon_Gamefixes.h" -#include "Resources/ConfigIcon_Paths.h" -#include "Resources/ConfigIcon_MemoryCard.h" +#include "gui/Resources/ConfigIcon_Cpu.h" +#include "gui/Resources/ConfigIcon_Video.h" +#include "gui/Resources/ConfigIcon_Speedhacks.h" +#include "gui/Resources/ConfigIcon_Gamefixes.h" +#include "gui/Resources/ConfigIcon_Paths.h" +#include "gui/Resources/ConfigIcon_MemoryCard.h" -#include "Resources/AppIcon16.h" -#include "Resources/AppIcon32.h" -#include "Resources/AppIcon64.h" +#include "gui/Resources/AppIcon16.h" +#include "gui/Resources/AppIcon32.h" +#include "gui/Resources/AppIcon64.h" RecentIsoList::RecentIsoList(int firstIdForMenuItems_or_wxID_ANY) { diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp index ff2cd2e364..f8cf726cb2 100644 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp +++ b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp @@ -21,7 +21,7 @@ #include "DebugEvents.h" #include "BreakpointWindow.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "System.h" #include "DisassemblyDialog.h" @@ -29,8 +29,8 @@ #include #include -#include "Resources/Breakpoint_Active.h" -#include "Resources/Breakpoint_Inactive.h" +#include "gui/Resources/Breakpoint_Active.h" +#include "gui/Resources/Breakpoint_Inactive.h" wxBEGIN_EVENT_TABLE(CtrlDisassemblyView, wxWindow) EVT_PAINT(CtrlDisassemblyView::paintEvent) diff --git a/pcsx2/gui/Debugger/CtrlMemView.cpp b/pcsx2/gui/Debugger/CtrlMemView.cpp index 8a2428c65f..3d60f4c62c 100644 --- a/pcsx2/gui/Debugger/CtrlMemView.cpp +++ b/pcsx2/gui/Debugger/CtrlMemView.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "CtrlMemView.h" #include "DebugTools/Debug.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "BreakpointWindow.h" #include "DebugEvents.h" diff --git a/pcsx2/gui/Debugger/CtrlRegisterList.cpp b/pcsx2/gui/Debugger/CtrlRegisterList.cpp index cc6a9b8102..c8443811e7 100644 --- a/pcsx2/gui/Debugger/CtrlRegisterList.cpp +++ b/pcsx2/gui/Debugger/CtrlRegisterList.cpp @@ -18,7 +18,7 @@ #include "DebugTools/Debug.h" #include "DebugEvents.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "DisassemblyDialog.h" wxBEGIN_EVENT_TABLE(CtrlRegisterList, wxWindow) diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index 8fce1c7b1c..2f50df9398 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -15,8 +15,8 @@ #include "PrecompiledHeader.h" -#include "App.h" -#include "MainFrame.h" +#include "gui/App.h" +#include "gui/MainFrame.h" #include "DisassemblyDialog.h" #include "DebugTools/DebugInterface.h" #include "DebugTools/DisassemblyManager.h" diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h index 24ab8c7b80..b6806e72da 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.h +++ b/pcsx2/gui/Debugger/DisassemblyDialog.h @@ -16,7 +16,7 @@ #pragma once #include #include -#include "App.h" +#include "gui/App.h" #include "CtrlDisassemblyView.h" #include "CtrlRegisterList.h" diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index e6e3f8f13d..2382cc7cb5 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -14,14 +14,14 @@ */ #include "PrecompiledHeader.h" -#include "App.h" -#include "AppCommon.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/AppCommon.h" +#include "gui/MSWstuff.h" -#include "Dialogs/ModalPopups.h" +#include "gui/Dialogs/ModalPopups.h" #include "common/EmbeddedImage.h" -#include "Resources/Logo.h" +#include "gui/Resources/Logo.h" #include #include diff --git a/pcsx2/gui/Dialogs/AssertionDialog.cpp b/pcsx2/gui/Dialogs/AssertionDialog.cpp index 2b45d2a399..4a4b121191 100644 --- a/pcsx2/gui/Dialogs/AssertionDialog.cpp +++ b/pcsx2/gui/Dialogs/AssertionDialog.cpp @@ -14,9 +14,9 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ModalPopups.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp b/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp index ae330d72ba..8673504523 100644 --- a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp +++ b/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp @@ -15,12 +15,12 @@ #include "PrecompiledHeader.h" #include "System.h" -#include "App.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/MSWstuff.h" #include "ConfigurationDialog.h" #include "ModalPopups.h" -#include "Panels/ConfigurationPanels.h" +#include "gui/Panels/ConfigurationPanels.h" #include #include diff --git a/pcsx2/gui/Dialogs/ConfigurationDialog.h b/pcsx2/gui/Dialogs/ConfigurationDialog.h index ce708b3986..bad3c2700f 100644 --- a/pcsx2/gui/Dialogs/ConfigurationDialog.h +++ b/pcsx2/gui/Dialogs/ConfigurationDialog.h @@ -18,9 +18,9 @@ #include #include -#include "AppCommon.h" -#include "ApplyState.h" -#include "App.h" +#include "gui/AppCommon.h" +#include "gui/ApplyState.h" +#include "gui/App.h" namespace Panels { diff --git a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp index bc222a94ce..25cfa3cb6a 100644 --- a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp +++ b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp @@ -15,8 +15,8 @@ #include "PrecompiledHeader.h" #include "System.h" -#include "App.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/MSWstuff.h" #include "ModalPopups.h" #include "common/StringHelpers.h" diff --git a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp index 1e1034c51e..822e607a51 100644 --- a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp +++ b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp @@ -17,10 +17,10 @@ #include "ConfigurationDialog.h" #include "System.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" -#include "MemoryCardFile.h" -#include "MemoryCardFolder.h" +#include "gui/MemoryCardFile.h" +#include "gui/MemoryCardFolder.h" #include enum MemoryCardConversionType { diff --git a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp index d33f4f85e5..14b8aec7e4 100644 --- a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp +++ b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp @@ -16,9 +16,9 @@ #include "PrecompiledHeader.h" #include "ConfigurationDialog.h" #include "System.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" -#include "MemoryCardFile.h" +#include "gui/MemoryCardFile.h" //#include #include diff --git a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp index e17de49004..7564cec384 100644 --- a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp +++ b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp @@ -15,10 +15,10 @@ #include "PrecompiledHeader.h" #include "System.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" #include "ModalPopups.h" -#include "Panels/ConfigurationPanels.h" +#include "gui/Panels/ConfigurationPanels.h" #include #include #include diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp index 99977409da..7396fc23c0 100644 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp @@ -14,20 +14,20 @@ */ #include "PrecompiledHeader.h" -#include "App.h" -#include "AppCommon.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/AppCommon.h" +#include "gui/MSWstuff.h" -#include "Dialogs/ModalPopups.h" +#include "gui/Dialogs/ModalPopups.h" #include "common/EmbeddedImage.h" -#include "Resources/NoIcon.h" +#include "gui/Resources/NoIcon.h" #include "GS.h" #include "PathDefs.h" -#include "AppConfig.h" -#include "GSFrame.h" +#include "gui/AppConfig.h" +#include "gui/GSFrame.h" #include "Counters.h" #include diff --git a/pcsx2/gui/Dialogs/IPCDialog.cpp b/pcsx2/gui/Dialogs/IPCDialog.cpp index c9806d1bff..04058a8d07 100644 --- a/pcsx2/gui/Dialogs/IPCDialog.cpp +++ b/pcsx2/gui/Dialogs/IPCDialog.cpp @@ -14,16 +14,16 @@ */ #include "PrecompiledHeader.h" -#include "App.h" -#include "AppCommon.h" -#include "MSWstuff.h" +#include "gui/App.h" +#include "gui/AppCommon.h" +#include "gui/MSWstuff.h" -#include "Dialogs/ModalPopups.h" +#include "gui/Dialogs/ModalPopups.h" #include "System/SysThreads.h" #include "PathDefs.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" using namespace pxSizerFlags; /* This dialog currently assumes the IPC server is started when launching a diff --git a/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp b/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp index fca88f99aa..cc9219c3f7 100644 --- a/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp +++ b/pcsx2/gui/Dialogs/ImportSettingsDialog.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "System.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" #include "ModalPopups.h" diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp b/pcsx2/gui/Dialogs/LogOptionsDialog.cpp index 990cad6b9f..d882aebb21 100644 --- a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp +++ b/pcsx2/gui/Dialogs/LogOptionsDialog.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "LogOptionsDialog.h" -#include "Panels/LogOptionsPanels.h" +#include "gui/Panels/LogOptionsPanels.h" #include diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.h b/pcsx2/gui/Dialogs/LogOptionsDialog.h index 7a9f16ed7e..f291105074 100644 --- a/pcsx2/gui/Dialogs/LogOptionsDialog.h +++ b/pcsx2/gui/Dialogs/LogOptionsDialog.h @@ -15,7 +15,7 @@ #pragma once -#include "App.h" +#include "gui/App.h" #include "ConfigurationDialog.h" #include "common/wxGuiTools.h" diff --git a/pcsx2/gui/Dialogs/McdConfigDialog.cpp b/pcsx2/gui/Dialogs/McdConfigDialog.cpp index cda9aadefe..d4af0e8555 100644 --- a/pcsx2/gui/Dialogs/McdConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/McdConfigDialog.cpp @@ -18,10 +18,10 @@ #include "ConfigurationDialog.h" #include "BaseConfigurationDialog.inl" #include "ModalPopups.h" -#include "MSWstuff.h" +#include "gui/MSWstuff.h" -#include "Panels/ConfigurationPanels.h" -#include "Panels/MemoryCardPanels.h" +#include "gui/Panels/ConfigurationPanels.h" +#include "gui/Panels/MemoryCardPanels.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Dialogs/ModalPopups.h b/pcsx2/gui/Dialogs/ModalPopups.h index 67859138a0..5c97c54b34 100644 --- a/pcsx2/gui/Dialogs/ModalPopups.h +++ b/pcsx2/gui/Dialogs/ModalPopups.h @@ -15,9 +15,9 @@ #pragma once -#include "App.h" +#include "gui/App.h" #include "ConfigurationDialog.h" -#include "Panels/ConfigurationPanels.h" +#include "gui/Panels/ConfigurationPanels.h" #include "common/pxStreams.h" #include diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp index 3facbe1317..7e1c8b5138 100644 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp @@ -15,13 +15,13 @@ #include "PrecompiledHeader.h" #include "System.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationDialog.h" #include "BaseConfigurationDialog.inl" #include "ModalPopups.h" -#include "Panels/ConfigurationPanels.h" -#include "MainFrame.h" +#include "gui/Panels/ConfigurationPanels.h" +#include "gui/MainFrame.h" using namespace Panels; using namespace pxSizerFlags; diff --git a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp b/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp index da2bdbe7cd..42474b1516 100644 --- a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp +++ b/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp @@ -14,10 +14,10 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationPanels.h" -#include "Dialogs/ConfigurationDialog.h" +#include "gui/Dialogs/ConfigurationDialog.h" #include diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp index fcc7bf95e2..7c83da5d56 100644 --- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp +++ b/pcsx2/gui/Panels/BiosSelectorPanel.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationPanels.h" #include "ps2/BiosTools.h" diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h index 9bdbf46dc6..1d1e87661e 100644 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ b/pcsx2/gui/Panels/ConfigurationPanels.h @@ -25,8 +25,8 @@ #include #include -#include "AppCommon.h" -#include "ApplyState.h" +#include "gui/AppCommon.h" +#include "gui/ApplyState.h" namespace Panels diff --git a/pcsx2/gui/Panels/DirPickerPanel.cpp b/pcsx2/gui/Panels/DirPickerPanel.cpp index e29aeb05bd..ca1e1461a3 100644 --- a/pcsx2/gui/Panels/DirPickerPanel.cpp +++ b/pcsx2/gui/Panels/DirPickerPanel.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "ConfigurationPanels.h" -#include "Dialogs/ModalPopups.h" +#include "gui/Dialogs/ModalPopups.h" #include #include diff --git a/pcsx2/gui/Panels/GSWindowPanel.cpp b/pcsx2/gui/Panels/GSWindowPanel.cpp index fa98a5b84a..33b72b4480 100644 --- a/pcsx2/gui/Panels/GSWindowPanel.cpp +++ b/pcsx2/gui/Panels/GSWindowPanel.cpp @@ -17,8 +17,8 @@ #include "ConfigurationPanels.h" #include "fmt/core.h" -#include "App.h" -#include "AppAccelerators.h" +#include "gui/App.h" +#include "gui/AppAccelerators.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Panels/GameFixesPanel.cpp b/pcsx2/gui/Panels/GameFixesPanel.cpp index d04988050a..1c0ddfa890 100644 --- a/pcsx2/gui/Panels/GameFixesPanel.cpp +++ b/pcsx2/gui/Panels/GameFixesPanel.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationPanels.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Panels/LogOptionsPanels.h b/pcsx2/gui/Panels/LogOptionsPanels.h index 020d1f2ed7..9eda40e332 100644 --- a/pcsx2/gui/Panels/LogOptionsPanels.h +++ b/pcsx2/gui/Panels/LogOptionsPanels.h @@ -15,8 +15,8 @@ #pragma once -#include "AppCommon.h" -#include "ApplyState.h" +#include "gui/AppCommon.h" +#include "gui/ApplyState.h" #include namespace Panels diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 71dc6c326e..15c55b8574 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -14,14 +14,14 @@ */ #include "PrecompiledHeader.h" -#include "AppCoreThread.h" +#include "gui/AppCoreThread.h" #include "System.h" -#include "MemoryCardFile.h" +#include "gui/MemoryCardFile.h" #include "ConfigurationPanels.h" #include "MemoryCardPanels.h" -#include "Dialogs/ConfigurationDialog.h" +#include "gui/Dialogs/ConfigurationDialog.h" #include "common/IniInterface.h" #include "Sio.h" diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index 9139c824de..2c739e0330 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -17,7 +17,7 @@ #include "ConfigurationPanels.h" #include "MemoryCardPanels.h" -#include "Dialogs/ConfigurationDialog.h" +#include "gui/Dialogs/ConfigurationDialog.h" #include "common/IniInterface.h" diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h index e19a32ea36..3262e676ea 100644 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ b/pcsx2/gui/Panels/MemoryCardPanels.h @@ -15,7 +15,7 @@ #pragma once -#include "AppCommon.h" +#include "gui/AppCommon.h" #include #include diff --git a/pcsx2/gui/Panels/MiscPanelStuff.cpp b/pcsx2/gui/Panels/MiscPanelStuff.cpp index a06195e20c..02c5f211c0 100644 --- a/pcsx2/gui/Panels/MiscPanelStuff.cpp +++ b/pcsx2/gui/Panels/MiscPanelStuff.cpp @@ -14,10 +14,10 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationPanels.h" -#include "Dialogs/ConfigurationDialog.h" +#include "gui/Dialogs/ConfigurationDialog.h" #include "ps2/BiosTools.h" diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index 94e51ab2cd..dbbd90d800 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "App.h" +#include "gui/App.h" #include "ConfigurationPanels.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Panels/VideoPanel.cpp b/pcsx2/gui/Panels/VideoPanel.cpp index a3be0bcee8..9f54dd7aa7 100644 --- a/pcsx2/gui/Panels/VideoPanel.cpp +++ b/pcsx2/gui/Panels/VideoPanel.cpp @@ -14,9 +14,9 @@ */ #include "PrecompiledHeader.h" -#include "App.h" -#include "AppAccelerators.h" -#include "Dialogs/ConfigurationDialog.h" +#include "gui/App.h" +#include "gui/AppAccelerators.h" +#include "gui/Dialogs/ConfigurationDialog.h" #include "ConfigurationPanels.h" #include diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index 30185514b6..1a2a36ab84 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -34,7 +34,6 @@ - $(ProjectDir)\gui;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\freetype\include;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index 462b06d9bd..ba2d834aaf 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -22,7 +22,7 @@ // FIXME: Temporary hack until we remove dependence on Pcsx2App. -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "wx/mstream.h" #include "wx/wfstream.h" diff --git a/pcsx2/windows/WinConsolePipe.cpp b/pcsx2/windows/WinConsolePipe.cpp index eb1f79f948..f1b0a8c4ba 100644 --- a/pcsx2/windows/WinConsolePipe.cpp +++ b/pcsx2/windows/WinConsolePipe.cpp @@ -16,8 +16,8 @@ #include "PrecompiledHeader.h" #include "Win32.h" -#include "App.h" -#include "ConsoleLogger.h" +#include "gui/App.h" +#include "gui/ConsoleLogger.h" // -------------------------------------------------------------------------------------- // Win32 Console Pipes diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 00c49b8251..d5a2dc417c 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -35,7 +35,7 @@ #include "IopCommon.h" #include "iCore.h" -#include "AppConfig.h" +#include "gui/AppConfig.h" #include "common/Perf.h" #include "DebugTools/Breakpoints.h" diff --git a/pcsx2/x86/microVU_Log.inl b/pcsx2/x86/microVU_Log.inl index c692926d38..d93f44a6f0 100644 --- a/pcsx2/x86/microVU_Log.inl +++ b/pcsx2/x86/microVU_Log.inl @@ -46,7 +46,7 @@ _mVUt void __mVULog(const char* fmt, ...) } \ } -#include "AppConfig.h" +#include "gui/AppConfig.h" void __mVUdumpProgram(microVU& mVU, microProgram& prog) {