diff --git a/Externals/ExternalsReferenceAll.props b/Externals/ExternalsReferenceAll.props new file mode 100644 index 0000000000..0d7de6fecd --- /dev/null +++ b/Externals/ExternalsReferenceAll.props @@ -0,0 +1,89 @@ + + + + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} + + + {41279555-f94f-4ebc-99de-af863c10c5c4} + + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + + + {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + + + {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} + + + {c636d9d1-82fe-42b5-9987-63b7d4836341} + + + {8ea11166-6512-44fc-b7a5-a4d1ecc81170} + + + {bb00605c-125f-4a21-b33b-7bf418322dcb} + + + {4482fd2a-ec43-3ffb-ac20-2e5c54b05ead} + + + {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} + + + {cbc76802-c128-4b17-bf6c-23b08c313e5e} + + + {8498f2fa-5ca6-4169-9971-de5b1fe6132c} + + + {d178061b-84d3-44f9-beed-efd18d9033f0} + + + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} + + + {055a775f-b4f5-4970-9240-f6cf7661f37b} + + + {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + + + {ab993f38-c31d-4897-b139-a620c42bc565} + + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {31643fdb-1bb8-4965-9de7-000fc88d35ae} + + + {23114507-079a-4418-9707-cfa81a03ca99} + + + {2c0d058e-de35-4471-ad99-e68a2caf9e18} + + + {38fee76f-f347-484b-949c-b4649381cffb} + + + {93d73454-2512-424e-9cda-4bb357fe13dd} + + + {ec082900-b4d8-42e9-9663-77f02f6936ae} + + + {677ea016-1182-440c-9345-dc88d1e98c0c} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + + + {1bea10f3-80ce-4bc4-9331-5769372cdf99} + + + diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj index 35c0056786..9f74333f73 100644 --- a/Externals/curl/curl.vcxproj +++ b/Externals/curl/curl.vcxproj @@ -360,11 +360,6 @@ - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - diff --git a/Externals/liblzma/liblzma.vcxproj b/Externals/liblzma/liblzma.vcxproj index f5a34f1bf3..e3a24ce660 100644 --- a/Externals/liblzma/liblzma.vcxproj +++ b/Externals/liblzma/liblzma.vcxproj @@ -18,7 +18,7 @@ .;check;common;delta;lz;lzma;rangecoder;simple;tuklib;%(AdditionalIncludeDirectories) - LZMA_API_STATIC;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + LZMA_API_STATIC;HAVE_CONFIG_H;%(PreprocessorDefinitions) diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index d1d649b4e0..5a8b402064 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -44,11 +44,6 @@ - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb-1.0.vcxproj similarity index 100% rename from Externals/libusb/libusb_static_2013.vcxproj rename to Externals/libusb/libusb-1.0.vcxproj diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index ad91ce17c5..1290f586fb 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -31,12 +31,12 @@ #include "Common/Version.h" #include "Common/WindowSystemInfo.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/ConfigLoaders/GameConfigLoader.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj deleted file mode 100644 index 270997ef92..0000000000 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {8498f2fa-5ca6-4169-9971-de5b1fe6132c} - - - {ec082900-b4d8-42e9-9663-77f02f6936ae} - - - - - - \ No newline at end of file diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters deleted file mode 100644 index 0d9a4818ad..0000000000 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ /dev/null @@ -1,64 +0,0 @@ - - - - - {25ec8f16-fc60-4a63-bc3e-ad0272fd5942} - - - - - - - - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - - - - - - - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - - - - - - \ No newline at end of file diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index e870c8a487..efc21594e3 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -7,8 +7,8 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index bd34046878..be8709cce1 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -18,7 +18,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" class WaveFileWriter { diff --git a/Source/Core/Common/Analytics.h b/Source/Core/Common/Analytics.h index b5d961d1d5..a49b6514f0 100644 --- a/Source/Core/Common/Analytics.h +++ b/Source/Core/Common/Analytics.h @@ -43,7 +43,7 @@ namespace Common { // Generic interface for an analytics reporting backends. The main -// implementation used in Dolphin can be found in Core/Analytics.h. +// implementation used in Dolphin can be found in Core/DolphinAnalytics.h. class AnalyticsReportingBackend { public: diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 7656fd1f58..14a1863fcf 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -43,8 +43,6 @@ add_library(common ENetUtil.cpp ENetUtil.h Event.h - File.cpp - File.h FileSearch.cpp FileSearch.h FileUtil.cpp @@ -66,6 +64,8 @@ add_library(common IniFile.cpp IniFile.h Inline.h + IOFile.cpp + IOFile.h JitRegister.cpp JitRegister.h Lazy.h @@ -106,10 +106,10 @@ add_library(common SDCardUtil.cpp SDCardUtil.h Semaphore.h - SFMLHelper.cpp - SFMLHelper.h SettingsHandler.cpp SettingsHandler.h + SFMLHelper.cpp + SFMLHelper.h SPSCQueue.h StringUtil.cpp StringUtil.h diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj deleted file mode 100644 index 07e040b626..0000000000 --- a/Source/Core/Common/Common.vcxproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - true - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - - - - - - - - - - {bb00605c-125f-4a21-b33b-7bf418322dcb} - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - - - - - - - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters deleted file mode 100644 index ec4dc86c9d..0000000000 --- a/Source/Core/Common/Common.vcxproj.filters +++ /dev/null @@ -1,380 +0,0 @@ - - - - - {0336df21-7c3f-48a9-b767-9cf11d8958a6} - - - {c54973ce-5723-491c-ac23-41cea3565b05} - - - {3bcf0d33-06a7-4eb6-bf2d-bc5273f551a3} - - - {79bb235a-a0ea-42e2-af6e-532088e5e253} - - - {c1d6f1fe-5ec5-406d-84f2-ed64d733d2c3} - - - {c6eef5b2-5e78-4f8c-8a51-8a4ffb768137} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Logging - - - Logging - - - Logging - - - Crypto - - - Crypto - - - Crypto - - - - - - - - - GL - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLInterface - - - - - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - - - - GL\GLExtensions - - - - Debug - - - Debug - - - Debug - - - GL\GLInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Crypto - - - Crypto - - - Crypto - - - Logging - - - - - - - Logging - - - GL - - - GL\GLExtensions - - - GL\GLInterface - - - - - - - - - Debug - - - - Debug - - - GL\GLInterface - - - - - - - - - - - - - diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index a8efba97c3..04d41cd118 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -20,8 +20,8 @@ #include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #ifdef _WIN32 diff --git a/Source/Core/Common/File.cpp b/Source/Core/Common/IOFile.cpp similarity index 98% rename from Source/Core/Common/File.cpp rename to Source/Core/Common/IOFile.cpp index c601eb33f2..9d59341cd6 100644 --- a/Source/Core/Common/File.cpp +++ b/Source/Core/Common/IOFile.cpp @@ -22,8 +22,8 @@ #endif #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" namespace File { diff --git a/Source/Core/Common/File.h b/Source/Core/Common/IOFile.h similarity index 100% rename from Source/Core/Common/File.h rename to Source/Core/Common/IOFile.h diff --git a/Source/Core/Common/Image.cpp b/Source/Core/Common/Image.cpp index 0621eb64d4..95baf5039f 100644 --- a/Source/Core/Common/Image.cpp +++ b/Source/Core/Common/Image.cpp @@ -10,7 +10,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" namespace Common { diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp index 1dcf999f3a..2163bf6417 100644 --- a/Source/Core/Common/JitRegister.cpp +++ b/Source/Core/Common/JitRegister.cpp @@ -13,7 +13,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/StringUtil.h" #ifdef _WIN32 diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index 43af78eb3d..d8bef3f293 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -11,7 +11,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Version.h" // On disk format: diff --git a/Source/Core/Common/PcapFile.cpp b/Source/Core/Common/PcapFile.cpp index 0d9ce9a5a3..540f641d54 100644 --- a/Source/Core/Common/PcapFile.cpp +++ b/Source/Core/Common/PcapFile.cpp @@ -5,7 +5,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/PcapFile.h" namespace Common diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h index e01c06bb11..dae0c1b2bb 100644 --- a/Source/Core/Common/PcapFile.h +++ b/Source/Core/Common/PcapFile.h @@ -17,7 +17,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" namespace Common { diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 5c0747436f..218db1bab0 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -43,7 +43,7 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #ifndef _WIN32 diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index cb1e795a1c..b56d7981cf 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -28,8 +28,8 @@ namespace fs = std::filesystem; #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/Boot/DolReader.cpp b/Source/Core/Core/Boot/DolReader.cpp index 61b8c64213..249fa65d8e 100644 --- a/Source/Core/Core/Boot/DolReader.cpp +++ b/Source/Core/Core/Boot/DolReader.cpp @@ -9,7 +9,7 @@ #include #include -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Swap.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp index 35abe4f6a5..d5e85fcbdf 100644 --- a/Source/Core/Core/Boot/ElfReader.cpp +++ b/Source/Core/Core/Boot/ElfReader.cpp @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Swap.h" diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 715945a319..8d7867d054 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -1,67 +1,21 @@ add_library(core ActionReplay.cpp ActionReplay.h - Analytics.cpp - Analytics.h ARDecrypt.cpp ARDecrypt.h - BootManager.cpp - BootManager.h - CheatCodes.h - CommonTitles.h - ConfigManager.cpp - ConfigManager.h - Core.cpp - Core.h - CoreTiming.cpp - CoreTiming.h - DSPEmulator.cpp - DSPEmulator.h - FreeLookConfig.cpp - FreeLookConfig.h - FreeLookManager.cpp - FreeLookManager.h - GeckoCodeConfig.cpp - GeckoCodeConfig.h - GeckoCode.cpp - GeckoCode.h - Host.h - HotkeyManager.cpp - HotkeyManager.h - LibusbUtils.cpp - LibusbUtils.h - MemTools.cpp - MemTools.h - Movie.cpp - Movie.h - NetPlayClient.cpp - NetPlayClient.h - NetPlayServer.cpp - NetPlayServer.h - PatchEngine.cpp - PatchEngine.h - State.cpp - State.h - SyncIdentifier.h - SysConf.cpp - SysConf.h - System.cpp - System.h - TitleDatabase.cpp - TitleDatabase.h - WiiRoot.cpp - WiiRoot.h - WiiUtils.cpp - WiiUtils.h Boot/Boot_BS2Emu.cpp + Boot/Boot_WiiWAD.cpp Boot/Boot.cpp Boot/Boot.h - Boot/Boot_WiiWAD.cpp Boot/DolReader.cpp Boot/DolReader.h Boot/ElfReader.cpp Boot/ElfReader.h Boot/ElfTypes.h + BootManager.cpp + BootManager.h + CheatCodes.h + CommonTitles.h Config/FreeLookSettings.cpp Config/FreeLookSettings.h Config/GraphicsSettings.cpp @@ -84,6 +38,12 @@ add_library(core ConfigLoaders/MovieConfigLoader.h ConfigLoaders/NetPlayConfigLoader.cpp ConfigLoaders/NetPlayConfigLoader.h + ConfigManager.cpp + ConfigManager.h + Core.cpp + Core.h + CoreTiming.cpp + CoreTiming.h Debugger/Debugger_SymbolMap.cpp Debugger/Debugger_SymbolMap.h Debugger/Dump.cpp @@ -95,6 +55,8 @@ add_library(core Debugger/PPCDebugInterface.h Debugger/RSO.cpp Debugger/RSO.h + DolphinAnalytics.cpp + DolphinAnalytics.h DSP/DSPAccelerator.cpp DSP/DSPAccelerator.h DSP/DSPAnalyzer.cpp @@ -115,8 +77,6 @@ add_library(core DSP/DSPStacks.cpp DSP/DSPTables.cpp DSP/DSPTables.h - DSP/LabelMap.cpp - DSP/LabelMap.h DSP/Interpreter/DSPIntArithmetic.cpp DSP/Interpreter/DSPIntBranch.cpp DSP/Interpreter/DSPIntCCUtil.h @@ -131,6 +91,10 @@ add_library(core DSP/Interpreter/DSPIntUtil.h DSP/Jit/DSPEmitterBase.cpp DSP/Jit/DSPEmitterBase.h + DSP/LabelMap.cpp + DSP/LabelMap.h + DSPEmulator.cpp + DSPEmulator.h FifoPlayer/FifoAnalyzer.cpp FifoPlayer/FifoAnalyzer.h FifoPlayer/FifoDataFile.cpp @@ -143,14 +107,25 @@ add_library(core FifoPlayer/FifoRecordAnalyzer.h FifoPlayer/FifoRecorder.cpp FifoPlayer/FifoRecorder.h - HLE/HLE.cpp - HLE/HLE.h + FreeLookConfig.cpp + FreeLookConfig.h + FreeLookManager.cpp + FreeLookManager.h + GeckoCode.cpp + GeckoCode.h + GeckoCodeConfig.cpp + GeckoCodeConfig.h HLE/HLE_Misc.cpp HLE/HLE_Misc.h HLE/HLE_OS.cpp HLE/HLE_OS.h HLE/HLE_VarArgs.cpp HLE/HLE_VarArgs.h + HLE/HLE.cpp + HLE/HLE.h + Host.h + HotkeyManager.cpp + HotkeyManager.h HW/AddressSpace.cpp HW/AddressSpace.h HW/AudioInterface.cpp @@ -159,6 +134,10 @@ add_library(core HW/CPU.h HW/DSP.cpp HW/DSP.h + HW/DSPHLE/DSPHLE.cpp + HW/DSPHLE/DSPHLE.h + HW/DSPHLE/MailHandler.cpp + HW/DSPHLE/MailHandler.h HW/DSPHLE/UCodes/AX.cpp HW/DSPHLE/UCodes/AX.h HW/DSPHLE/UCodes/AXStructs.h @@ -177,17 +156,13 @@ add_library(core HW/DSPHLE/UCodes/UCodes.h HW/DSPHLE/UCodes/Zelda.cpp HW/DSPHLE/UCodes/Zelda.h - HW/DSPHLE/MailHandler.cpp - HW/DSPHLE/MailHandler.h - HW/DSPHLE/DSPHLE.cpp - HW/DSPHLE/DSPHLE.h HW/DSPLLE/DSPHost.cpp - HW/DSPLLE/DSPSymbols.cpp - HW/DSPLLE/DSPSymbols.h - HW/DSPLLE/DSPLLEGlobals.cpp - HW/DSPLLE/DSPLLEGlobals.h HW/DSPLLE/DSPLLE.cpp HW/DSPLLE/DSPLLE.h + HW/DSPLLE/DSPLLEGlobals.cpp + HW/DSPLLE/DSPLLEGlobals.h + HW/DSPLLE/DSPSymbols.cpp + HW/DSPLLE/DSPSymbols.h HW/DVD/DVDInterface.cpp HW/DVD/DVDInterface.h HW/DVD/DVDMath.cpp @@ -196,8 +171,6 @@ add_library(core HW/DVD/DVDThread.h HW/DVD/FileMonitor.cpp HW/DVD/FileMonitor.h - HW/EXI/EXI.cpp - HW/EXI/EXI.h HW/EXI/EXI_Channel.cpp HW/EXI/EXI_Channel.h HW/EXI/EXI_Device.cpp @@ -218,6 +191,8 @@ add_library(core HW/EXI/EXI_DeviceMemoryCard.h HW/EXI/EXI_DeviceMic.cpp HW/EXI/EXI_DeviceMic.h + HW/EXI/EXI.cpp + HW/EXI/EXI.h HW/GCKeyboard.cpp HW/GCKeyboard.h HW/GCKeyboardEmu.cpp @@ -249,8 +224,6 @@ add_library(core HW/MMIO.h HW/ProcessorInterface.cpp HW/ProcessorInterface.h - HW/SI/SI.cpp - HW/SI/SI.h HW/SI/SI_Device.cpp HW/SI/SI_Device.h HW/SI/SI_DeviceDanceMat.cpp @@ -267,6 +240,8 @@ add_library(core HW/SI/SI_DeviceKeyboard.h HW/SI/SI_DeviceNull.cpp HW/SI/SI_DeviceNull.h + HW/SI/SI.cpp + HW/SI/SI.h HW/Sram.cpp HW/Sram.h HW/StreamADPCM.cpp @@ -291,6 +266,24 @@ add_library(core HW/WiimoteEmu/EmuSubroutines.cpp HW/WiimoteEmu/Encryption.cpp HW/WiimoteEmu/Encryption.h + HW/WiimoteEmu/Extension/Classic.cpp + HW/WiimoteEmu/Extension/Classic.h + HW/WiimoteEmu/Extension/DrawsomeTablet.cpp + HW/WiimoteEmu/Extension/DrawsomeTablet.h + HW/WiimoteEmu/Extension/Drums.cpp + HW/WiimoteEmu/Extension/Drums.h + HW/WiimoteEmu/Extension/Extension.cpp + HW/WiimoteEmu/Extension/Extension.h + HW/WiimoteEmu/Extension/Guitar.cpp + HW/WiimoteEmu/Extension/Guitar.h + HW/WiimoteEmu/Extension/Nunchuk.cpp + HW/WiimoteEmu/Extension/Nunchuk.h + HW/WiimoteEmu/Extension/TaTaCon.cpp + HW/WiimoteEmu/Extension/TaTaCon.h + HW/WiimoteEmu/Extension/Turntable.cpp + HW/WiimoteEmu/Extension/Turntable.h + HW/WiimoteEmu/Extension/UDrawTablet.cpp + HW/WiimoteEmu/Extension/UDrawTablet.h HW/WiimoteEmu/ExtensionPort.cpp HW/WiimoteEmu/ExtensionPort.h HW/WiimoteEmu/I2CBus.cpp @@ -301,24 +294,6 @@ add_library(core HW/WiimoteEmu/Speaker.h HW/WiimoteEmu/WiimoteEmu.cpp HW/WiimoteEmu/WiimoteEmu.h - HW/WiimoteEmu/Extension/Classic.cpp - HW/WiimoteEmu/Extension/Classic.h - HW/WiimoteEmu/Extension/DrawsomeTablet.cpp - HW/WiimoteEmu/Extension/DrawsomeTablet.h - HW/WiimoteEmu/Extension/Drums.cpp - HW/WiimoteEmu/Extension/Drums.h - HW/WiimoteEmu/Extension/Extension.cpp - HW/WiimoteEmu/Extension/Extension.h - HW/WiimoteEmu/Extension/Nunchuk.cpp - HW/WiimoteEmu/Extension/Nunchuk.h - HW/WiimoteEmu/Extension/Guitar.cpp - HW/WiimoteEmu/Extension/Guitar.h - HW/WiimoteEmu/Extension/TaTaCon.cpp - HW/WiimoteEmu/Extension/TaTaCon.h - HW/WiimoteEmu/Extension/Turntable.cpp - HW/WiimoteEmu/Extension/Turntable.h - HW/WiimoteEmu/Extension/UDrawTablet.cpp - HW/WiimoteEmu/Extension/UDrawTablet.h HW/WiimoteReal/WiimoteReal.cpp HW/WiimoteReal/WiimoteReal.h HW/WiiSave.cpp @@ -328,18 +303,10 @@ add_library(core IOS/Device.h IOS/DeviceStub.cpp IOS/DeviceStub.h - IOS/DolphinDevice.cpp - IOS/DolphinDevice.h - IOS/IOS.cpp - IOS/IOS.h - IOS/IOSC.cpp - IOS/IOSC.h - IOS/MIOS.cpp - IOS/MIOS.h - IOS/VersionInfo.cpp - IOS/VersionInfo.h IOS/DI/DI.cpp IOS/DI/DI.h + IOS/DolphinDevice.cpp + IOS/DolphinDevice.h IOS/ES/ES.cpp IOS/ES/ES.h IOS/ES/Formats.cpp @@ -350,21 +317,21 @@ add_library(core IOS/ES/TitleInformation.cpp IOS/ES/TitleManagement.cpp IOS/ES/Views.cpp - IOS/FS/FileSystem.cpp IOS/FS/FileSystem.h + IOS/FS/FileSystemCommon.cpp IOS/FS/FileSystemProxy.cpp IOS/FS/FileSystemProxy.h IOS/FS/HostBackend/File.cpp IOS/FS/HostBackend/FS.cpp IOS/FS/HostBackend/FS.h + IOS/IOS.cpp + IOS/IOS.h + IOS/IOSC.cpp + IOS/IOSC.h + IOS/MIOS.cpp + IOS/MIOS.h IOS/Network/ICMP.h IOS/Network/ICMPLin.cpp - IOS/Network/MACUtils.cpp - IOS/Network/MACUtils.h - IOS/Network/Socket.cpp - IOS/Network/Socket.h - IOS/Network/SSL.cpp - IOS/Network/SSL.h IOS/Network/IP/Top.cpp IOS/Network/IP/Top.h IOS/Network/KD/NetKDRequest.cpp @@ -373,38 +340,22 @@ add_library(core IOS/Network/KD/NetKDTime.h IOS/Network/KD/NWC24Config.cpp IOS/Network/KD/NWC24Config.h - IOS/Network/NCD/WiiNetConfig.cpp - IOS/Network/NCD/WiiNetConfig.h + IOS/Network/MACUtils.cpp + IOS/Network/MACUtils.h IOS/Network/NCD/Manage.cpp IOS/Network/NCD/Manage.h + IOS/Network/NCD/WiiNetConfig.cpp + IOS/Network/NCD/WiiNetConfig.h + IOS/Network/Socket.cpp + IOS/Network/Socket.h + IOS/Network/SSL.cpp + IOS/Network/SSL.h IOS/Network/WD/Command.cpp IOS/Network/WD/Command.h IOS/SDIO/SDIOSlot0.cpp IOS/SDIO/SDIOSlot0.h IOS/STM/STM.cpp IOS/STM/STM.h - IOS/USB/Common.cpp - IOS/USB/Common.h - IOS/USB/Host.cpp - IOS/USB/Host.h - IOS/USB/OH0/OH0.cpp - IOS/USB/OH0/OH0.h - IOS/USB/OH0/OH0Device.cpp - IOS/USB/OH0/OH0Device.h - IOS/USB/USB_HID/HIDv4.cpp - IOS/USB/USB_HID/HIDv4.h - IOS/USB/USB_HID/HIDv5.cpp - IOS/USB/USB_HID/HIDv5.h - IOS/USB/USB_VEN/VEN.cpp - IOS/USB/USB_VEN/VEN.h - IOS/USB/USBV0.cpp - IOS/USB/USBV0.h - IOS/USB/USBV4.cpp - IOS/USB/USBV4.h - IOS/USB/USBV5.cpp - IOS/USB/USBV5.h - IOS/USB/USB_KBD.cpp - IOS/USB/USB_KBD.h IOS/USB/Bluetooth/BTBase.cpp IOS/USB/Bluetooth/BTBase.h IOS/USB/Bluetooth/BTEmu.cpp @@ -417,14 +368,72 @@ add_library(core IOS/USB/Bluetooth/WiimoteDevice.h IOS/USB/Bluetooth/WiimoteHIDAttr.cpp IOS/USB/Bluetooth/WiimoteHIDAttr.h - IOS/WFS/WFSSRV.cpp - IOS/WFS/WFSSRV.h + IOS/USB/Common.cpp + IOS/USB/Common.h + IOS/USB/Host.cpp + IOS/USB/Host.h + IOS/USB/OH0/OH0.cpp + IOS/USB/OH0/OH0.h + IOS/USB/OH0/OH0Device.cpp + IOS/USB/OH0/OH0Device.h + IOS/USB/USB_HID/HIDv4.cpp + IOS/USB/USB_HID/HIDv4.h + IOS/USB/USB_HID/HIDv5.cpp + IOS/USB/USB_HID/HIDv5.h + IOS/USB/USB_KBD.cpp + IOS/USB/USB_KBD.h + IOS/USB/USB_VEN/VEN.cpp + IOS/USB/USB_VEN/VEN.h + IOS/USB/USBV0.cpp + IOS/USB/USBV0.h + IOS/USB/USBV4.cpp + IOS/USB/USBV4.h + IOS/USB/USBV5.cpp + IOS/USB/USBV5.h + IOS/VersionInfo.cpp + IOS/VersionInfo.h IOS/WFS/WFSI.cpp IOS/WFS/WFSI.h + IOS/WFS/WFSSRV.cpp + IOS/WFS/WFSSRV.h + LibusbUtils.cpp + LibusbUtils.h + MemTools.cpp + MemTools.h + Movie.cpp + Movie.h + NetPlayClient.cpp + NetPlayClient.h + NetPlayServer.cpp + NetPlayServer.h + PatchEngine.cpp + PatchEngine.h PowerPC/BreakPoints.cpp PowerPC/BreakPoints.h + PowerPC/CachedInterpreter/CachedInterpreter.cpp + PowerPC/CachedInterpreter/CachedInterpreter.h + PowerPC/CachedInterpreter/InterpreterBlockCache.cpp + PowerPC/CachedInterpreter/InterpreterBlockCache.h PowerPC/ConditionRegister.cpp PowerPC/ConditionRegister.h + PowerPC/Interpreter/ExceptionUtils.h + PowerPC/Interpreter/Interpreter_Branch.cpp + PowerPC/Interpreter/Interpreter_FloatingPoint.cpp + PowerPC/Interpreter/Interpreter_FPUtils.h + PowerPC/Interpreter/Interpreter_Integer.cpp + PowerPC/Interpreter/Interpreter_LoadStore.cpp + PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp + PowerPC/Interpreter/Interpreter_Paired.cpp + PowerPC/Interpreter/Interpreter_SystemRegisters.cpp + PowerPC/Interpreter/Interpreter_Tables.cpp + PowerPC/Interpreter/Interpreter.cpp + PowerPC/Interpreter/Interpreter.h + PowerPC/JitCommon/JitAsmCommon.cpp + PowerPC/JitCommon/JitAsmCommon.h + PowerPC/JitCommon/JitBase.cpp + PowerPC/JitCommon/JitBase.h + PowerPC/JitCommon/JitCache.cpp + PowerPC/JitCommon/JitCache.h PowerPC/JitInterface.cpp PowerPC/JitInterface.h PowerPC/MMU.cpp @@ -440,16 +449,6 @@ add_library(core PowerPC/PPCTables.cpp PowerPC/PPCTables.h PowerPC/Profiler.h - PowerPC/CachedInterpreter/CachedInterpreter.cpp - PowerPC/CachedInterpreter/CachedInterpreter.h - PowerPC/CachedInterpreter/InterpreterBlockCache.cpp - PowerPC/CachedInterpreter/InterpreterBlockCache.h - PowerPC/JitCommon/JitAsmCommon.cpp - PowerPC/JitCommon/JitAsmCommon.h - PowerPC/JitCommon/JitBase.cpp - PowerPC/JitCommon/JitBase.h - PowerPC/JitCommon/JitCache.cpp - PowerPC/JitCommon/JitCache.h PowerPC/SignatureDB/CSVSignatureDB.cpp PowerPC/SignatureDB/CSVSignatureDB.h PowerPC/SignatureDB/DSYSignatureDB.cpp @@ -458,18 +457,19 @@ add_library(core PowerPC/SignatureDB/MEGASignatureDB.h PowerPC/SignatureDB/SignatureDB.cpp PowerPC/SignatureDB/SignatureDB.h - PowerPC/Interpreter/ExceptionUtils.h - PowerPC/Interpreter/Interpreter_Branch.cpp - PowerPC/Interpreter/Interpreter.cpp - PowerPC/Interpreter/Interpreter.h - PowerPC/Interpreter/Interpreter_FloatingPoint.cpp - PowerPC/Interpreter/Interpreter_FPUtils.h - PowerPC/Interpreter/Interpreter_Integer.cpp - PowerPC/Interpreter/Interpreter_LoadStore.cpp - PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp - PowerPC/Interpreter/Interpreter_Paired.cpp - PowerPC/Interpreter/Interpreter_SystemRegisters.cpp - PowerPC/Interpreter/Interpreter_Tables.cpp + State.cpp + State.h + SyncIdentifier.h + SysConf.cpp + SysConf.h + System.cpp + System.h + TitleDatabase.cpp + TitleDatabase.h + WiiRoot.cpp + WiiRoot.h + WiiUtils.cpp + WiiUtils.h ) if(_M_X86) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index d68c215998..472a54a99e 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -28,13 +28,13 @@ #include "Common/StringUtil.h" #include "Common/scmrev.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/CommonTitles.h" #include "Core/Config/MainSettings.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigLoaders/GameConfigLoader.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/HLE/HLE.h" #include "Core/HW/DVD/DVDInterface.h" diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 8bd48aff74..88bb42579b 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -36,12 +36,12 @@ #include "Common/Timer.h" #include "Common/Version.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/DSPEmulator.h" +#include "Core/DolphinAnalytics.h" #include "Core/FifoPlayer/FifoPlayer.h" #include "Core/FreeLookManager.h" #include "Core/HLE/HLE.h" diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj deleted file mode 100644 index efcec09564..0000000000 --- a/Source/Core/Core/Core.vcxproj +++ /dev/null @@ -1,745 +0,0 @@ - - - - - - {E54CF649-140E-4255-81A5-30A673C1FB36} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - {160bdc25-5626-4b0d-bdd8-2953d9777fb5} - - - {6bbd47cf-91fd-4077-b676-8b76980178a9} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {8ea11166-6512-44fc-b7a5-a4d1ecc81170} - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - {349ee8f9-7d25-4909-aaf5-ff3fade72187} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {31643fdb-1bb8-4965-9de7-000fc88d35ae} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {23114507-079a-4418-9707-cfa81a03ca99} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - - - - \ No newline at end of file diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters deleted file mode 100644 index a30d217970..0000000000 --- a/Source/Core/Core/Core.vcxproj.filters +++ /dev/null @@ -1,1764 +0,0 @@ - - - - - {e0d231ab-7a66-45ce-a8e4-c0225308f763} - - - {2472fb36-5473-4d49-ad2d-3699b78ab6e2} - - - {259a11eb-ca07-4b31-b849-7286dbd4550a} - - - {ed683a12-55f0-49cb-918b-c7edbcf57268} - - - {35594696-15a6-44cb-b811-04e3195eecf5} - - - {659f0a99-77cf-46a0-a7a3-95afdd99be72} - - - {c1c76a12-b4f3-4a46-84e6-e11980b2e997} - - - {256586c3-3a1b-4d7b-9f4a-2f7ffac9d23e} - - - {d060b137-c211-44eb-9cad-fc12dedbea73} - - - {ebd24590-dfdc-433e-a411-21723e4b7cb5} - - - {d6410c05-51f9-422a-83d5-f0723e34b607} - - - {523f8d77-4aa6-4762-8f27-96f02b5070b4} - - - {c67be826-2935-4d25-a213-e132fa2e63ef} - - - {c88ec388-371f-4401-851c-a32dcdc0b88b} - - - {6204f663-bbd0-4eb5-bc15-e3778d8b6091} - - - {5377680f-d667-4f1a-aa86-b616c19a5cd4} - - - {712e3a61-b818-434e-a724-ef8de1f09027} - - - {d657188a-426d-46c8-af0a-caa148c6ed1b} - - - {2832269e-5c7d-47f8-b212-afcd9145e427} - - - {9a10faaa-40c3-446c-81b6-5fc7a79d5329} - - - {7a29a81c-1fee-4e5b-bfe1-5f941837bdc9} - - - {0eecffe7-f680-4d21-a05f-2f12c8244833} - - - {9fcd7c03-c4be-477b-9c15-5f096ab9d0f6} - - - {69d8dcb1-f22b-47af-b1e4-f700b1a42e77} - - - {079f3720-45c8-4c54-8589-b7d00a8bc1ac} - - - {bc3e845a-3d01-4713-aa32-f27110838d0c} - - - {d19f1218-0e28-4f24-a4b3-33fac750a899} - - - {15452851-6ca5-4520-bbf1-d4b810317be3} - - - {d7b3050d-3dd9-4284-969c-c5ad3b3662d9} - - - {15452851-6ca5-4520-bbf1-d4b810317be2} - - - {2ef543bc-8125-4b96-9627-6d8c15a5b36a} - - - {dea96a0c-0274-4c9f-915e-97472e7f4578} - - - {9fbdb5b5-9179-4488-b0bf-75c1ccdb3a61} - - - {11385524-b10b-419b-8390-710791c53550} - - - {fa27e799-34c8-440a-9de3-6720df6022e7} - - - {2b41ab45-ba8c-45dc-92cc-9107c1fa3e36} - - - {81956f71-d9fe-454f-96a6-855195d611c4} - - - {e14b3339-dc23-46d6-845d-7206dc4f88c3} - - - {c1e2e0dc-30ac-44cd-9909-e5b594647a04} - - - {5846b261-397e-4e2a-89e3-88d22ab927c5} - - - {ab9cdd90-54d7-4f42-9248-d7903ce52cc8} - - - {f20fc3ea-846b-4629-b86c-fd7860f73ee9} - - - {165768ae-ee50-4789-8051-5c5b7023fa4b} - - - {a749993a-d2cf-46b6-9f7f-f76294e9ad02} - - - {fc3080d6-d99a-44c6-bdd4-140cec1c6bf0} - - - {3db8c364-1d72-4660-9179-86d1c46904b9} - - - {75be4669-90fe-4280-b0ea-df350f481357} - - - {7fae98ef-4b62-4701-8f08-c496bd1ce2a7} - - - {b132ac6a-a02e-429e-858b-bfbc3fdc1851} - - - {2bfd4ecc-7225-48f0-91b9-efb42aaf71bf} - - - {1fa9df3e-6741-4045-b2f6-457b4a0540a9} - - - {a3d4778e-1891-458e-9bd1-009c2f5e8ed9} - - - {f0b52c84-49f4-470a-b037-edeea5634b9e} - - - {ee6645da-3ad9-4fe7-809f-e4646d0b0ca5} - - - {68c09d7e-4f5a-435d-a0d2-7eb7a74d7054} - - - {132cd43e-84be-4939-9f0c-0e7f26794598} - - - {9e91e72c-e432-4e02-8e03-c45c2b6f6957} - - - - - - - - - - - - - - - - - - - - - - ActionReplay - - - ActionReplay - - - Boot - - - Boot - - - Boot - - - Boot - - - Boot - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Jit - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - GeckoCode - - - GeckoCode - - - HLE - - - HLE - - - HLE - - - HLE - - - PowerPC - - - PowerPC - - - PowerPC\Cached Interpreter - - - PowerPC\Cached Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo - - - HW %28Flipper/Hollywood%29\MI - Memory Interface - - - HW %28Flipper/Hollywood%29\PI - Processor Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\VI - Video Interface - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wii IPC - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - HW %28Flipper/Hollywood%29\Wiimote - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - PowerPC - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS - - - IOS\DI - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\Network - - - IOS - - - IOS - - - IOS - - - IOS - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network\IP - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\NCD - - - IOS\Network\WD - - - IOS\SDIO - - - IOS\STM - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\WFS - - - IOS\WFS - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - PowerPC\Jit64Common - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - Config - - - Config - - - Config - - - Config - - - IOS\Network\NCD - - - Config - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29 - - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - Config - - - - - - - - - - - - - - - - - - - - - - - - - - - ActionReplay - - - ActionReplay - - - Boot - - - Boot - - - Boot - - - Boot - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Jit - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - GeckoCode - - - GeckoCode - - - HLE - - - HLE - - - HLE - - - HLE - - - PowerPC\Cached Interpreter - - - PowerPC\Cached Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo - - - HW %28Flipper/Hollywood%29\MI - Memory Interface - - - HW %28Flipper/Hollywood%29\PI - Processor Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\VI - Video Interface - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wii IPC - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - HW %28Flipper/Hollywood%29\Wiimote - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS\DI - - - IOS\ES - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\ES - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network\IP - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\NCD - - - IOS\Network\WD - - - IOS\SDIO - - - IOS\STM - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\WFS - - - IOS\WFS - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS - - - IOS - - - IOS - - - PowerPC\Jit64Common - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - Config - - - Config - - - Config - - - Config - - - IOS\Network\NCD - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - Config - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - - HW %28Flipper/Hollywood%29 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArmCommon - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - - - Config - - - - - - - - \ No newline at end of file diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.cpp b/Source/Core/Core/DSP/DSPCaptureLogger.cpp index 2703d6b3cc..d7885759da 100644 --- a/Source/Core/Core/DSP/DSPCaptureLogger.cpp +++ b/Source/Core/Core/DSP/DSPCaptureLogger.cpp @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/PcapFile.h" namespace DSP diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index 2bca7af4b2..9b6e365246 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -12,8 +12,8 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp index 7df86e05ce..1032119a1f 100644 --- a/Source/Core/Core/Debugger/Dump.cpp +++ b/Source/Core/Core/Debugger/Dump.cpp @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" CDump::CDump(const std::string& filename) : m_pData(nullptr) { diff --git a/Source/Core/Core/Analytics.cpp b/Source/Core/Core/DolphinAnalytics.cpp similarity index 99% rename from Source/Core/Core/Analytics.cpp rename to Source/Core/Core/DolphinAnalytics.cpp index a0b4fc2175..81dbc16643 100644 --- a/Source/Core/Core/Analytics.cpp +++ b/Source/Core/Core/DolphinAnalytics.cpp @@ -1,4 +1,4 @@ -#include "Core/Analytics.h" +#include "Core/DolphinAnalytics.h" #include #include diff --git a/Source/Core/Core/Analytics.h b/Source/Core/Core/DolphinAnalytics.h similarity index 100% rename from Source/Core/Core/Analytics.h rename to Source/Core/Core/DolphinAnalytics.h diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index e2896ce88e..69fb5aad54 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -10,7 +10,7 @@ #include #include -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Core/Config/MainSettings.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp index 3272fbd425..b0c272ab60 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp @@ -10,8 +10,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Swap.h" #include "Core/HW/DSP.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp index 7a7ffb0996..d9fe607f66 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp @@ -7,7 +7,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Core/DSP/DSPCore.h" diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index f1793626d3..b8bed7c592 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -18,10 +18,10 @@ #include "Common/Config/Config.h" #include "Common/Logging/Log.h" -#include "Core/Analytics.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/AudioInterface.h" #include "Core/HW/DVD/DVDMath.h" #include "Core/HW/DVD/DVDThread.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp index 4dd3960400..2030f5a953 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp @@ -11,7 +11,7 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index 13515bb4cb..0769ea41af 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -13,8 +13,8 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/GCMemcard/GCIFile.cpp b/Source/Core/Core/HW/GCMemcard/GCIFile.cpp index fe9d3972a3..c2dab152ff 100644 --- a/Source/Core/Core/HW/GCMemcard/GCIFile.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCIFile.cpp @@ -8,7 +8,7 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" namespace Memcard diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp index 6bf6e1468c..27382a8a48 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp @@ -16,7 +16,7 @@ #include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Common/Swap.h" diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp index a9ecf13fb2..fb93096dbd 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp @@ -19,9 +19,9 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" -#include "Common/File.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp index 77ad32f400..338c61f908 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp @@ -16,8 +16,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h index e23fc6dd4e..a39c9e8b61 100644 --- a/Source/Core/Core/HW/GCPad.h +++ b/Source/Core/Core/HW/GCPad.h @@ -5,7 +5,7 @@ #pragma once #include "Common/CommonTypes.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" class InputConfig; enum class PadGroup; diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp index 91eb668a74..a44a1cb2f4 100644 --- a/Source/Core/Core/HW/Sram.cpp +++ b/Source/Core/Core/HW/Sram.cpp @@ -5,7 +5,7 @@ #include "Core/HW/Sram.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Swap.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/WiiSave.cpp b/Source/Core/Core/HW/WiiSave.cpp index 2bc87b8dad..bb715770b1 100644 --- a/Source/Core/Core/HW/WiiSave.cpp +++ b/Source/Core/Core/HW/WiiSave.cpp @@ -26,8 +26,8 @@ #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/Crypto/ec.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Lazy.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index 00bfd2b0d9..bf71f7e6f6 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -13,8 +13,8 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Swap.h" -#include "Core/Analytics.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/WiimoteCommon/WiimoteHid.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 867184d4da..680e85d61c 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -26,7 +26,7 @@ #include "Core/HW/WiimoteReal/IOWin.h" #include "Core/HW/WiimoteReal/IOdarwin.h" #include "Core/HW/WiimoteReal/IOhidapi.h" -#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h" +#include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h" #include "InputCommon/InputConfig.h" #include "SFML/Network.hpp" @@ -85,7 +85,7 @@ static void TryToFillWiimoteSlot(u32 index) // If the pool is empty, attempt to steal from ControllerInterface. if (s_wiimote_pool.empty()) { - ciface::Wiimote::ReleaseDevices(1); + ciface::WiimoteController::ReleaseDevices(1); // Still empty? if (s_wiimote_pool.empty()) @@ -108,13 +108,13 @@ void ProcessWiimotePool() if (SConfig::GetInstance().connect_wiimotes_for_ciface) { for (auto& entry : s_wiimote_pool) - ciface::Wiimote::AddDevice(std::move(entry.wiimote)); + ciface::WiimoteController::AddDevice(std::move(entry.wiimote)); s_wiimote_pool.clear(); } else { - ciface::Wiimote::ReleaseDevices(); + ciface::WiimoteController::ReleaseDevices(); } } @@ -858,7 +858,7 @@ void Shutdown() HandleWiimoteDisconnect(i); // Release remotes from ControllerInterface and empty the pool. - ciface::Wiimote::ReleaseDevices(); + ciface::WiimoteController::ReleaseDevices(); s_wiimote_pool.clear(); } diff --git a/Source/Core/Core/IOS/DI/DI.cpp b/Source/Core/Core/IOS/DI/DI.cpp index 591364e2a9..44a02f0a40 100644 --- a/Source/Core/Core/IOS/DI/DI.cpp +++ b/Source/Core/Core/IOS/DI/DI.cpp @@ -12,8 +12,8 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Core/Analytics.h" #include "Core/CoreTiming.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/DVD/DVDThread.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/IOS/DolphinDevice.cpp b/Source/Core/Core/IOS/DolphinDevice.cpp index 6a21dd8db8..be5ae219e7 100644 --- a/Source/Core/Core/IOS/DolphinDevice.cpp +++ b/Source/Core/Core/IOS/DolphinDevice.cpp @@ -6,8 +6,8 @@ #include #include "Common/CommonPaths.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" #include "Common/SettingsHandler.h" diff --git a/Source/Core/Core/IOS/FS/FileSystem.cpp b/Source/Core/Core/IOS/FS/FileSystemCommon.cpp similarity index 100% rename from Source/Core/Core/IOS/FS/FileSystem.cpp rename to Source/Core/Core/IOS/FS/FileSystemCommon.cpp diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.h b/Source/Core/Core/IOS/FS/HostBackend/FS.h index beb4d56148..69f070e2c8 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/FS.h +++ b/Source/Core/Core/IOS/FS/HostBackend/FS.h @@ -11,7 +11,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Core/IOS/FS/FileSystem.h" namespace IOS::HLE::FS diff --git a/Source/Core/Core/IOS/FS/HostBackend/File.cpp b/Source/Core/Core/IOS/FS/HostBackend/File.cpp index 5a36f37b9f..1e28eac3e3 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/File.cpp +++ b/Source/Core/Core/IOS/FS/HostBackend/File.cpp @@ -5,8 +5,8 @@ #include #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/IOS/IOSC.cpp b/Source/Core/Core/IOS/IOSC.cpp index d80bcb6f1a..e93a6d3d56 100644 --- a/Source/Core/Core/IOS/IOSC.cpp +++ b/Source/Core/Core/IOS/IOSC.cpp @@ -22,8 +22,8 @@ #include "Common/ChunkFile.h" #include "Common/Crypto/AES.h" #include "Common/Crypto/ec.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/ScopeGuard.h" #include "Common/Swap.h" #include "Core/IOS/Device.h" diff --git a/Source/Core/Core/IOS/Network/SSL.cpp b/Source/Core/Core/IOS/Network/SSL.cpp index dc2a110098..30d8286c0f 100644 --- a/Source/Core/Core/IOS/Network/SSL.cpp +++ b/Source/Core/Core/IOS/Network/SSL.cpp @@ -12,8 +12,8 @@ #include #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/Core/IOS/Network/Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp index a6e4393391..b2f4429d55 100644 --- a/Source/Core/Core/IOS/Network/Socket.cpp +++ b/Source/Core/Core/IOS/Network/Socket.cpp @@ -17,8 +17,8 @@ #include #endif -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/IOS/Network/WD/Command.cpp b/Source/Core/Core/IOS/Network/WD/Command.cpp index 0f6eb0b49d..57aec2e939 100644 --- a/Source/Core/Core/IOS/Network/WD/Command.cpp +++ b/Source/Core/Core/IOS/Network/WD/Command.cpp @@ -12,7 +12,7 @@ #include "Common/Logging/Log.h" #include "Common/Network.h" #include "Common/Swap.h" -#include "Core/Analytics.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/Memmap.h" #include "Core/IOS/Network/MACUtils.h" diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index 4fa12a070a..b50cc864c3 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -11,8 +11,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/SDCardUtil.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.h b/Source/Core/Core/IOS/SDIO/SDIOSlot0.h index 61fcba273d..3ff0f6a783 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.h +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.h @@ -10,7 +10,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp index f76bab63b6..e153dc6a57 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp @@ -10,8 +10,8 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Core/SysConf.h" diff --git a/Source/Core/Core/IOS/WFS/WFSI.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp index 0cf865e657..12d6b7b1ad 100644 --- a/Source/Core/Core/IOS/WFS/WFSI.cpp +++ b/Source/Core/Core/IOS/WFS/WFSI.cpp @@ -13,8 +13,8 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" #include "Core/IOS/ES/ES.h" diff --git a/Source/Core/Core/IOS/WFS/WFSSRV.cpp b/Source/Core/Core/IOS/WFS/WFSSRV.cpp index ff392fbed7..6cb595752f 100644 --- a/Source/Core/Core/IOS/WFS/WFSSRV.cpp +++ b/Source/Core/Core/IOS/WFS/WFSSRV.cpp @@ -10,8 +10,8 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/IOS/WFS/WFSSRV.h b/Source/Core/Core/IOS/WFS/WFSSRV.h index ed27a6b726..af6e90bed1 100644 --- a/Source/Core/Core/IOS/WFS/WFSSRV.h +++ b/Source/Core/Core/IOS/WFS/WFSSRV.h @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index a4113f9b4e..c760025b4b 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -25,9 +25,9 @@ #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/Config/Config.h" -#include "Common/File.h" #include "Common/FileUtil.h" #include "Common/Hash.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index f144f77c52..3a16332b89 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -24,8 +24,8 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/ENetUtil.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MD5.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index eafddd36e6..0fa0088c9a 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -23,9 +23,9 @@ #include "Common/CommonPaths.h" #include "Common/ENetUtil.h" -#include "Common/File.h" #include "Common/FileUtil.h" #include "Common/HttpRequest.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/SFMLHelper.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 79e2a7c407..6d776f9e89 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -17,8 +17,8 @@ #endif #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/GekkoDisassembler.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" #include "Common/PerformanceCounter.h" diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index f226539f56..33c481fdf5 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -20,7 +20,7 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Core/Core.h" diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index ad7735c9d1..dd57394028 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -8,7 +8,7 @@ #include "Common/ChunkFile.h" #include "Common/Swap.h" -#include "Core/Analytics.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index ea55abf0f6..8ebcad2c66 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -15,7 +15,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index ef03d5c6d5..e1b11f8370 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -15,8 +15,8 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp index 34404b061c..58b7aea802 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp @@ -10,8 +10,8 @@ #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" // CSV separated with tabs diff --git a/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp index ce69de1f95..a0faccbf61 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" namespace diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index d86da80cfe..99eaff80f2 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -17,8 +17,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Event.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Common/ScopeGuard.h" #include "Common/Thread.h" diff --git a/Source/Core/Core/SysConf.cpp b/Source/Core/Core/SysConf.cpp index 1efd4a2244..f5a42a8b88 100644 --- a/Source/Core/Core/SysConf.cpp +++ b/Source/Core/Core/SysConf.cpp @@ -10,8 +10,8 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Swap.h" #include "Core/IOS/FS/FileSystem.h" diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp index bace0233b9..b042edc039 100644 --- a/Source/Core/Core/WiiRoot.cpp +++ b/Source/Core/Core/WiiRoot.cpp @@ -12,8 +12,8 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index e24c52f181..d744c8fd5e 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -11,7 +11,7 @@ #include "Common/CDUtils.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index 7fb5c2f4f6..650244da79 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/CISOBlob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h index 97ef23ab5e..53c982ed0e 100644 --- a/Source/Core/DiscIO/CISOBlob.h +++ b/Source/Core/DiscIO/CISOBlob.h @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 35bbced94c..db5eae5a31 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -19,9 +19,9 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" #include "Common/Hash.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h index d1b2459145..0a46b111a4 100644 --- a/Source/Core/DiscIO/CompressedBlob.h +++ b/Source/Core/DiscIO/CompressedBlob.h @@ -18,7 +18,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index 609f98ef4b..8840283777 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -20,8 +20,8 @@ #include "Common/Assert.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Common/Swap.h" diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index acf692a4f4..8aff525cec 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -11,8 +11,8 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "DiscIO/Enums.h" #include "DiscIO/Filesystem.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj deleted file mode 100644 index 16a6a41aa0..0000000000 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - {160BDC25-5626-4B0D-BDD8-2953D9777FB5} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {055a775f-b4f5-4970-9240-f6cf7661f37b} - - - {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - {1bea10f3-80ce-4bc4-9331-5769372cdf99} - - - - - - \ No newline at end of file diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters deleted file mode 100644 index 196120fd6a..0000000000 --- a/Source/Core/DiscIO/DiscIO.vcxproj.filters +++ /dev/null @@ -1,191 +0,0 @@ - - - - - {51cdf366-d3fe-464a-9f89-c9f1592a6f1c} - - - {3873659a-9a30-4a58-af9e-8dad7d7eb627} - - - {bd7dbc22-b233-4f82-a369-034f04133b73} - - - {0a2c0bb1-2948-4dfb-9216-77410c39a42c} - - - {cbce645c-943c-4a94-8be0-8ad529b5c825} - - - {3d2fc224-a486-4975-a617-d19f4439702b} - - - - - DiscScrubber - - - FileSystem - - - FileSystem - - - NAND - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume\Blob - - - DiscExtractor - - - NAND - - - Volume - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - - - - DiscScrubber - - - FileSystem - - - FileSystem - - - NAND - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume - - - Volume\Blob - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume\Blob - - - DiscExtractor - - - NAND - - - Volume - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - - - - - \ No newline at end of file diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index 3a1ba4d275..2daaddbfa6 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -10,7 +10,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index ec100185e8..f5cd7e49d1 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" #ifdef _WIN32 diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h index d418976fa3..48519d03f3 100644 --- a/Source/Core/DiscIO/FileBlob.h +++ b/Source/Core/DiscIO/FileBlob.h @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 40b15d3715..c706e809a8 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -15,7 +15,7 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp index aea5398426..bc97ef0460 100644 --- a/Source/Core/DiscIO/NANDImporter.cpp +++ b/Source/Core/DiscIO/NANDImporter.cpp @@ -11,8 +11,8 @@ #include #include "Common/Crypto/AES.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Swap.h" diff --git a/Source/Core/DiscIO/TGCBlob.cpp b/Source/Core/DiscIO/TGCBlob.cpp index b14e0017b1..0c78fed411 100644 --- a/Source/Core/DiscIO/TGCBlob.cpp +++ b/Source/Core/DiscIO/TGCBlob.cpp @@ -11,7 +11,7 @@ #include #include -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Swap.h" namespace diff --git a/Source/Core/DiscIO/TGCBlob.h b/Source/Core/DiscIO/TGCBlob.h index 302a0926f4..786aa46f9d 100644 --- a/Source/Core/DiscIO/TGCBlob.h +++ b/Source/Core/DiscIO/TGCBlob.h @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index c1c9a8ae3b..2a217f72f1 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -25,9 +25,9 @@ #include "Common/Assert.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" #include "Common/HttpRequest.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MinizipUtil.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index 6ffc8a286b..8a76b9bd77 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -22,8 +22,8 @@ #include "Common/Align.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/ScopeGuard.h" diff --git a/Source/Core/DiscIO/WIABlob.h b/Source/Core/DiscIO/WIABlob.h index 5b08dd227c..d6e54df7ac 100644 --- a/Source/Core/DiscIO/WIABlob.h +++ b/Source/Core/DiscIO/WIABlob.h @@ -13,7 +13,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Swap.h" #include "DiscIO/Blob.h" #include "DiscIO/MultithreadedCompressor.h" diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 7d24b3b618..6dae7bd7ce 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -15,7 +15,7 @@ #include "Common/Align.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/MsgHandler.h" #include "Common/Swap.h" diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h index d3bca22ecc..5c1ca2e3e5 100644 --- a/Source/Core/DiscIO/WbfsBlob.h +++ b/Source/Core/DiscIO/WbfsBlob.h @@ -9,7 +9,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "DiscIO/Blob.h" namespace DiscIO diff --git a/Source/Core/DiscIO/WiiSaveBanner.cpp b/Source/Core/DiscIO/WiiSaveBanner.cpp index e6b8e39f5f..59b9bca3c5 100644 --- a/Source/Core/DiscIO/WiiSaveBanner.cpp +++ b/Source/Core/DiscIO/WiiSaveBanner.cpp @@ -10,7 +10,7 @@ #include "Common/ColorUtil.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DolphinLib.ARM64.props b/Source/Core/DolphinLib.ARM64.props new file mode 100644 index 0000000000..61d9bd84b0 --- /dev/null +++ b/Source/Core/DolphinLib.ARM64.props @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props new file mode 100644 index 0000000000..9142fb1bc4 --- /dev/null +++ b/Source/Core/DolphinLib.props @@ -0,0 +1,1201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/DolphinLib.vcxproj similarity index 56% rename from Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj rename to Source/Core/DolphinLib.vcxproj index 18c92fe5aa..5485304bdd 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/DolphinLib.vcxproj @@ -1,9 +1,9 @@  - - + + - {DEA96CF2-F237-4A1A-B32F-C916769EFB50} + {d79392f7-06d6-4b4b-a39f-4d587c215d3a} @@ -15,22 +15,18 @@ + + + + + + + - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} + + {41279555-f94f-4ebc-99de-af863c10c5c4} - - + \ No newline at end of file diff --git a/Source/Core/DolphinLib.vcxproj.user b/Source/Core/DolphinLib.vcxproj.user new file mode 100644 index 0000000000..966b4ffb6f --- /dev/null +++ b/Source/Core/DolphinLib.vcxproj.user @@ -0,0 +1,6 @@ + + + + true + + \ No newline at end of file diff --git a/Source/Core/DolphinLib.x64.props b/Source/Core/DolphinLib.x64.props new file mode 100644 index 0000000000..3cdddfb028 --- /dev/null +++ b/Source/Core/DolphinLib.x64.props @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 1acb1d5291..bee23c9944 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -24,40 +24,17 @@ - - {e54cf649-140e-4255-81a5-30a673c1fb36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {604c8368-f34a-4d55-82c8-cc92a0c13254} + + {41279555-f94f-4ebc-99de-af863c10c5c4} - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53a5391b-737e-49a8-bc8f-312ada00736f} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29f29a19-f141-45ad-9679-5a2923b49da3} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 0bf4df23b8..5ab18a38eb 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -17,10 +17,10 @@ #endif #include "Common/StringUtil.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/Host.h" #include "UICommon/CommandLineParse.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/IOWindow.h b/Source/Core/DolphinQt/Config/Mapping/IOWindow.h index 28294fc284..87e2e0843a 100644 --- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.h +++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.h @@ -12,7 +12,7 @@ #include #include "Common/Flag.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" class ControlReference; class MappingWidget; diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h index 27a3cf7041..cdd68a16c0 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h +++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h @@ -7,7 +7,7 @@ #include #include -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" class QString; class OutputReference; diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index e337226b2f..b07d61c8c0 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -24,7 +24,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/Force.h" #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "DolphinQt/Config/Mapping/MappingWidget.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp index ea8811895d..976b289d44 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp @@ -47,7 +47,7 @@ #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/InputConfig.h" constexpr const char* PROFILES_DIR = "Profiles/"; diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h index 520cdc2f68..aade3b23df 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h @@ -8,7 +8,7 @@ #include #include -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp index 4b95b079d1..e226046c2a 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp @@ -20,8 +20,8 @@ #include #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/AddressSpace.h" diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 187b500e4c..3a21497eef 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -358,73 +358,17 @@ - - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} {41279555-f94f-4ebc-99de-af863c10c5c4} - - {e54cf649-140e-4255-81a5-30a673c1fb36} - - - {160bdc25-5626-4b0d-bdd8-2953d9777fb5} - - - {6bbd47cf-91fd-4077-b676-8b76980178a9} - - - {604C8368-F34A-4D55-82C8-CC92A0C13254} - - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29f29a19-f141-45ad-9679-5a2923b49da3} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - - - {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - + diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp index 945912dea7..98aaa480d5 100644 --- a/Source/Core/DolphinQt/Main.cpp +++ b/Source/Core/DolphinQt/Main.cpp @@ -21,10 +21,10 @@ #include "Common/MsgHandler.h" #include "Common/ScopeGuard.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/Config/MainSettings.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "DolphinQt/Host.h" #include "DolphinQt/MainWindow.h" diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp index 62ca50469f..705bdee7ed 100644 --- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp +++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp @@ -16,11 +16,11 @@ #include #include -#include "Core/Analytics.h" #include "Core/Config/MainSettings.h" #include "Core/Config/UISettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" diff --git a/Source/Core/DolphinQt/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp index 335f0cd098..f35ee43fcc 100644 --- a/Source/Core/DolphinQt/Translation.cpp +++ b/Source/Core/DolphinQt/Translation.cpp @@ -12,8 +12,8 @@ #include #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index e0b8664a06..eb6c079f6b 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -54,10 +54,10 @@ add_library(inputcommon ControllerInterface/DualShockUDPClient/DualShockUDPProto.h ControllerInterface/ControllerInterface.cpp ControllerInterface/ControllerInterface.h - ControllerInterface/Device.cpp - ControllerInterface/Device.h - ControllerInterface/Wiimote/Wiimote.cpp - ControllerInterface/Wiimote/Wiimote.h + ControllerInterface/CoreDevice.cpp + ControllerInterface/CoreDevice.h + ControllerInterface/Wiimote/WiimoteController.cpp + ControllerInterface/Wiimote/WiimoteController.h ControlReference/ControlReference.cpp ControlReference/ControlReference.h ControlReference/ExpressionParser.cpp diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h index fb4b5cc1df..59a21e8b7d 100644 --- a/Source/Core/InputCommon/ControlReference/ControlReference.h +++ b/Source/Core/InputCommon/ControlReference/ControlReference.h @@ -8,7 +8,7 @@ #include #include "InputCommon/ControlReference/ExpressionParser.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" // ControlReference // diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h index a879528d4b..9789e9afe0 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h @@ -9,7 +9,7 @@ #include #include -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ciface::ExpressionParser { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h index d13fd60a68..ac0266f7c1 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h @@ -6,7 +6,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/StickGate.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h index a5a6a95cd0..562313bb45 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h @@ -8,7 +8,7 @@ #include #include "InputCommon/ControllerEmu/StickGate.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h index 95a7d89dad..a997654c0c 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h @@ -8,7 +8,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h index ade18b9f3b..dfd57c1a9a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h @@ -7,7 +7,7 @@ #include #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h index b3df548ede..de969f59b5 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h @@ -8,7 +8,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h index 929a0e2fb7..dc4c2364de 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h @@ -8,7 +8,7 @@ #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerEmu/StickGate.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h index 107b94c6f8..8b72d6738b 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h @@ -9,7 +9,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h index eaca692ced..00f750088a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h @@ -16,7 +16,7 @@ #include "Common/IniFile.h" #include "Common/MathUtil.h" #include "InputCommon/ControlReference/ExpressionParser.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/DynamicInputTextureManager.h" class ControllerInterface; diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h index f049ddc565..443f34d2ec 100644 --- a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h +++ b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h @@ -10,7 +10,7 @@ #include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "InputCommon/ControlReference/ControlReference.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 84209a720b..ffa189437f 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -12,7 +12,7 @@ #include "Common/Matrix.h" #include "Common/WindowSystemInfo.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" // enable disable sources #ifdef _WIN32 diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp similarity index 99% rename from Source/Core/InputCommon/ControllerInterface/Device.cpp rename to Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp index 2fd7fb02e7..3a396ddf37 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include #include diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h similarity index 100% rename from Source/Core/InputCommon/ControllerInterface/Device.h rename to Source/Core/InputCommon/ControllerInterface/CoreDevice.h diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 70e8af8e6e..fe0f46424f 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -4,7 +4,7 @@ #pragma once -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" namespace ciface::DInput diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 0ae81fb6be..c3834df528 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -7,8 +7,8 @@ #include #include "Common/Matrix.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/ControllerInterface/DInput/DInput8.h" -#include "InputCommon/ControllerInterface/Device.h" namespace ciface::DInput { diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h index c689cef5a5..8fab93c429 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -10,7 +10,7 @@ #include "Common/Event.h" #include "Common/Flag.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #ifdef _WIN32 #include diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h index 377f7d9b29..89552a80de 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h @@ -8,7 +8,7 @@ #include -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h" namespace ciface::OSX diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h index 39516035a3..740954082b 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h @@ -7,7 +7,7 @@ #include #include "Common/Matrix.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ciface::Quartz { diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index e9ac021bd9..38b6bf3cfb 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -14,7 +14,7 @@ #include #endif -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ciface::SDL { diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp similarity index 99% rename from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp rename to Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp index 2a11904550..eaa56ef449 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h" +#include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h" #include "Common/BitUtils.h" #include "Common/Logging/Log.h" @@ -13,7 +13,7 @@ #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -namespace ciface::Wiimote +namespace ciface::WiimoteController { static constexpr char SOURCE_NAME[] = "Bluetooth"; @@ -1677,4 +1677,4 @@ void Device::ProcessStatusReport(const InputReportStatus& status) } } -} // namespace ciface::Wiimote +} // namespace ciface::WiimoteController diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h similarity index 98% rename from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h rename to Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h index 0dc9082af6..4864e0abb3 100644 --- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h +++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h @@ -16,9 +16,9 @@ #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h" #include "Core/HW/WiimoteEmu/MotionPlus.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" -namespace ciface::Wiimote +namespace ciface::WiimoteController { using namespace WiimoteCommon; @@ -279,4 +279,4 @@ private: Clock::time_point m_last_report_time = Clock::now(); }; -} // namespace ciface::Wiimote +} // namespace ciface::WiimoteController diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp index a2f1ca879c..171b74f3d2 100644 --- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp @@ -12,8 +12,8 @@ #include #include "Common/CommonPaths.h" -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/InputCommon/ImageOperations.cpp b/Source/Core/InputCommon/ImageOperations.cpp index b659a9358b..7ce3b2d389 100644 --- a/Source/Core/InputCommon/ImageOperations.cpp +++ b/Source/Core/InputCommon/ImageOperations.cpp @@ -11,8 +11,8 @@ #include #include -#include "Common/File.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "Common/Image.h" namespace InputCommon diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj deleted file mode 100644 index 8cd9f05963..0000000000 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - {6BBD47CF-91FD-4077-B676-8B76980178A9} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - - - - diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters deleted file mode 100644 index 17f6cdf489..0000000000 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ /dev/null @@ -1,261 +0,0 @@ - - - - - {3a755a86-0efa-4396-bf79-bb3a1910764d} - - - {e10ce316-283c-4be0-848d-578dec2b6404} - - - {4c839215-4085-4e34-a960-7960986ad015} - - - {19ddd862-a1e3-479b-b638-bb31700c5171} - - - {e805231c-dc4e-4540-8bf8-8c567f3d00ae} - - - {ce661cb4-f23f-4ab2-952d-402d381735e5} - - - {6ca06b20-d8f6-4622-97ab-eefbc66edbd5} - - - {0289ef91-50f5-4c16-9fa4-ff4c4d8208e7} - - - {07bad1aa-7e03-4f5c-ade2-a44857c5cbc3} - - - {ff02580e-3a62-4de4-a135-3a6c2c339a90} - - - - - - - ControllerEmu - - - ControllerEmu - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\Setting - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\XInput - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface\ForceFeedback - - - ControllerInterface\DInput - - - ControllerInterface\Win32 - - - ControllerInterface\Wiimote - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface - - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerInterface\DualShockUDPClient - - - - - - - - - - ControllerEmu - - - ControllerEmu - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\Setting - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\XInput - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface\ForceFeedback - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\Win32 - - - ControllerInterface\Wiimote - - - ControllerInterface - - - ControllerInterface - - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - - ControllerInterface\DualShockUDPClient - - - ControllerInterface\DualShockUDPClient - - - - - - - - diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp index a169ef0f66..3b2e8a0bd3 100644 --- a/Source/Core/UICommon/GameFile.cpp +++ b/Source/Core/UICommon/GameFile.cpp @@ -26,9 +26,9 @@ #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" #include "Common/HttpRequest.h" +#include "Common/IOFile.h" #include "Common/Image.h" #include "Common/IniFile.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp index 38dd09f8a8..8fe2ef8a24 100644 --- a/Source/Core/UICommon/GameFileCache.cpp +++ b/Source/Core/UICommon/GameFileCache.cpp @@ -17,9 +17,9 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" +#include "Common/IOFile.h" #include "DiscIO/DirectoryBlob.h" diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj deleted file mode 100644 index f39896f4a1..0000000000 --- a/Source/Core/UICommon/UICommon.vcxproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - {604C8368-F34A-4D55-82C8-CC92A0C13254} - - - - - - - - - - - - - - - - - {E54CF649-140E-4255-81A5-30A673C1FB36} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - - - {2c0d058e-de35-4471-ad99-e68a2caf9e18} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {C636D9D1-82FE-42B5-9987-63B7D4836341} - - - - - - \ No newline at end of file diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj deleted file mode 100644 index e707486a3d..0000000000 --- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - {B001D13E-7EAB-4689-842D-801E5ACFFAC5} - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - - {bb00605c-125f-4a21-b33b-7bf418322dcb} - - - {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/CMakeLists.txt b/Source/Core/VideoBackends/D3D/CMakeLists.txt index 0b4a859ec4..b8ebb509b9 100644 --- a/Source/Core/VideoBackends/D3D/CMakeLists.txt +++ b/Source/Core/VideoBackends/D3D/CMakeLists.txt @@ -1,25 +1,25 @@ add_library(videod3d - BoundingBox.cpp - BoundingBox.h D3DBase.cpp D3DBase.h + D3DBoundingBox.cpp + D3DBoundingBox.h + D3DMain.cpp + D3DNativeVertexFormat.cpp + D3DPerfQuery.cpp + D3DPerfQuery.h + D3DRender.cpp + D3DRender.h D3DState.cpp D3DState.h + D3DSwapChain.cpp + D3DVertexManager.cpp + D3DVertexManager.h DXPipeline.cpp DXPipeline.h DXShader.cpp DXShader.h DXTexture.cpp DXTexture.h - main.cpp - NativeVertexFormat.cpp - PerfQuery.cpp - PerfQuery.h - Render.cpp - Render.h - SwapChain.cpp - VertexManager.cpp - VertexManager.h VideoBackend.h ) diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj deleted file mode 100644 index a549474bdd..0000000000 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters deleted file mode 100644 index 630e95a808..0000000000 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {ae700f7e-33c8-45b5-b7ee-a0ded3630549} - - - {3683d29b-19f6-4e7a-803f-4ac70b1d49fd} - - - - - D3D - - - D3D - - - Render - - - Render - - - Render - - - Render - - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - D3D - - - D3D - - - Render - - - Render - - - Render - - - - Render - - - Render - - - Render - - - Render - - - Render - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index 74b871db44..c3549fbd49 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -15,7 +15,7 @@ #include "Core/ConfigManager.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/DXTexture.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.cpp b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp similarity index 96% rename from Source/Core/VideoBackends/D3D/BoundingBox.cpp rename to Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp index 7cae36e1a1..ad9caba647 100644 --- a/Source/Core/VideoBackends/D3D/BoundingBox.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D/BoundingBox.h" +#include "VideoBackends/D3D/D3DBoundingBox.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "VideoBackends/D3D/D3DState.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.h b/Source/Core/VideoBackends/D3D/D3DBoundingBox.h similarity index 100% rename from Source/Core/VideoBackends/D3D/BoundingBox.h rename to Source/Core/VideoBackends/D3D/D3DBoundingBox.h diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp similarity index 95% rename from Source/Core/VideoBackends/D3D/main.cpp rename to Source/Core/VideoBackends/D3D/D3DMain.cpp index a916b4d6fc..2bcec31659 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp @@ -10,14 +10,14 @@ #include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "VideoBackends/D3D/BoundingBox.h" #include "VideoBackends/D3D/D3DBase.h" -#include "VideoBackends/D3D/PerfQuery.h" -#include "VideoBackends/D3D/Render.h" -#include "VideoBackends/D3D/SwapChain.h" -#include "VideoBackends/D3D/VertexManager.h" +#include "VideoBackends/D3D/D3DBoundingBox.h" +#include "VideoBackends/D3D/D3DPerfQuery.h" +#include "VideoBackends/D3D/D3DRender.h" +#include "VideoBackends/D3D/D3DSwapChain.h" +#include "VideoBackends/D3D/D3DVertexManager.h" #include "VideoBackends/D3D/VideoBackend.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/ShaderCache.h" diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp rename to Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp index 6233059262..d8294d7abc 100644 --- a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp @@ -5,10 +5,10 @@ #include #include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DRender.h" #include "VideoBackends/D3D/D3DState.h" +#include "VideoBackends/D3D/D3DVertexManager.h" #include "VideoBackends/D3D/DXShader.h" -#include "VideoBackends/D3D/Render.h" -#include "VideoBackends/D3D/VertexManager.h" #include "VideoCommon/NativeVertexFormat.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D/PerfQuery.cpp rename to Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp index 70eba20c57..a05077e14b 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.cpp +++ b/Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D/PerfQuery.h" +#include "VideoBackends/D3D/D3DPerfQuery.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/D3DPerfQuery.h similarity index 100% rename from Source/Core/VideoBackends/D3D/PerfQuery.h rename to Source/Core/VideoBackends/D3D/D3DPerfQuery.h diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/D3DRender.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D/Render.cpp rename to Source/Core/VideoBackends/D3D/D3DRender.cpp index 83a177342e..8830039af8 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/D3DRender.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D/Render.h" +#include "VideoBackends/D3D/D3DRender.h" #include #include @@ -21,13 +21,13 @@ #include "Core/Core.h" -#include "VideoBackends/D3D/BoundingBox.h" #include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBoundingBox.h" #include "VideoBackends/D3D/D3DState.h" +#include "VideoBackends/D3D/D3DSwapChain.h" #include "VideoBackends/D3D/DXPipeline.h" #include "VideoBackends/D3D/DXShader.h" #include "VideoBackends/D3D/DXTexture.h" -#include "VideoBackends/D3D/SwapChain.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/D3DRender.h similarity index 100% rename from Source/Core/VideoBackends/D3D/Render.h rename to Source/Core/VideoBackends/D3D/D3DRender.h diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp index 8e10385af6..b345de0a38 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.cpp +++ b/Source/Core/VideoBackends/D3D/D3DState.cpp @@ -13,7 +13,7 @@ #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/DXTexture.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/SwapChain.cpp b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp similarity index 96% rename from Source/Core/VideoBackends/D3D/SwapChain.cpp rename to Source/Core/VideoBackends/D3D/D3DSwapChain.cpp index 7a2e889194..66684f3a4b 100644 --- a/Source/Core/VideoBackends/D3D/SwapChain.cpp +++ b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D/SwapChain.h" +#include "VideoBackends/D3D/D3DSwapChain.h" #include "VideoBackends/D3D/DXTexture.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/SwapChain.h b/Source/Core/VideoBackends/D3D/D3DSwapChain.h similarity index 100% rename from Source/Core/VideoBackends/D3D/SwapChain.h rename to Source/Core/VideoBackends/D3D/D3DSwapChain.h diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D/VertexManager.cpp rename to Source/Core/VideoBackends/D3D/D3DVertexManager.cpp index 817f58c656..e813bcd48a 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D/VertexManager.h" +#include "VideoBackends/D3D/D3DVertexManager.h" #include @@ -10,11 +10,11 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "VideoBackends/D3D/BoundingBox.h" #include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DBoundingBox.h" +#include "VideoBackends/D3D/D3DRender.h" #include "VideoBackends/D3D/D3DState.h" -#include "VideoBackends/D3D/Render.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/BoundingBox.h" #include "VideoCommon/GeometryShaderManager.h" diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/D3DVertexManager.h similarity index 100% rename from Source/Core/VideoBackends/D3D/VertexManager.h rename to Source/Core/VideoBackends/D3D/D3DVertexManager.h diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.cpp b/Source/Core/VideoBackends/D3D/DXPipeline.cpp index 67450b11da..23e5e6dd21 100644 --- a/Source/Core/VideoBackends/D3D/DXPipeline.cpp +++ b/Source/Core/VideoBackends/D3D/DXPipeline.cpp @@ -6,12 +6,12 @@ #include "Common/Logging/Log.h" #include "VideoBackends/D3D/D3DBase.h" +#include "VideoBackends/D3D/D3DRender.h" #include "VideoBackends/D3D/D3DState.h" +#include "VideoBackends/D3D/D3DVertexManager.h" #include "VideoBackends/D3D/DXPipeline.h" #include "VideoBackends/D3D/DXShader.h" #include "VideoBackends/D3D/DXTexture.h" -#include "VideoBackends/D3D/Render.h" -#include "VideoBackends/D3D/VertexManager.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp index 24ac81b8bc..92c7c2b673 100644 --- a/Source/Core/VideoBackends/D3D/DXTexture.cpp +++ b/Source/Core/VideoBackends/D3D/DXTexture.cpp @@ -11,7 +11,7 @@ #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/DXTexture.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D12/CMakeLists.txt b/Source/Core/VideoBackends/D3D12/CMakeLists.txt index 08eec49005..5b440775c0 100644 --- a/Source/Core/VideoBackends/D3D12/CMakeLists.txt +++ b/Source/Core/VideoBackends/D3D12/CMakeLists.txt @@ -1,30 +1,30 @@ add_library(videod3d12 - BoundingBox.cpp - BoundingBox.h + D3D12BoundingBox.cpp + D3D12BoundingBox.h + D3D12PerfQuery.cpp + D3D12PerfQuery.h + D3D12Renderer.cpp + D3D12Renderer.h + D3D12StreamBuffer.cpp + D3D12StreamBuffer.h + D3D12SwapChain.cpp + D3D12SwapChain.h + D3D12VertexManager.cpp + D3D12VertexManager.h DescriptorAllocator.cpp DescriptorAllocator.h DescriptorHeapManager.cpp DescriptorHeapManager.h - DXContext.cpp - DXContext.h - DXPipeline.cpp - DXPipeline.h - DXShader.cpp - DXShader.h - DXTexture.cpp - DXTexture.h - DXVertexFormat.cpp - DXVertexFormat.h - PerfQuery.cpp - PerfQuery.h - Renderer.cpp - Renderer.h - StreamBuffer.cpp - StreamBuffer.h - SwapChain.cpp - SwapChain.h - VertexManager.cpp - VertexManager.h + DX12Context.cpp + DX12Context.h + DX12Pipeline.cpp + DX12Pipeline.h + DX12Shader.cpp + DX12Shader.h + DX12Texture.cpp + DX12Texture.h + DX12VertexFormat.cpp + DX12VertexFormat.h VideoBackend.cpp VideoBackend.h ) diff --git a/Source/Core/VideoBackends/D3D12/Common.h b/Source/Core/VideoBackends/D3D12/Common.h index f0b4b29d96..c5c79d5800 100644 --- a/Source/Core/VideoBackends/D3D12/Common.h +++ b/Source/Core/VideoBackends/D3D12/Common.h @@ -7,7 +7,7 @@ #include #include "Common/MsgHandler.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj deleted file mode 100644 index 3c297763f7..0000000000 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - {570215B7-E32F-4438-95AE-C8D955F9FCA3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters deleted file mode 100644 index 24feadc6ff..0000000000 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp similarity index 97% rename from Source/Core/VideoBackends/D3D12/BoundingBox.cpp rename to Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp index f5f44c4ef4..cc79e4094c 100644 --- a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/BoundingBox.h" +#include "VideoBackends/D3D12/D3D12BoundingBox.h" #include "Common/Logging/Log.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/Renderer.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/DX12Context.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/BoundingBox.h b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h similarity index 96% rename from Source/Core/VideoBackends/D3D12/BoundingBox.h rename to Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h index 45cb979ca8..2942b9a3e3 100644 --- a/Source/Core/VideoBackends/D3D12/BoundingBox.h +++ b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h @@ -5,8 +5,8 @@ #pragma once #include #include "VideoBackends/D3D12/Common.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/StreamBuffer.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D12/PerfQuery.cpp rename to Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp index bcea01ab9b..d6b6b6a193 100644 --- a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/PerfQuery.h" +#include "VideoBackends/D3D12/D3D12PerfQuery.h" #include #include "Common/Assert.h" #include "Common/Logging/Log.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/Renderer.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoCommon/VideoCommon.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.h b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h similarity index 97% rename from Source/Core/VideoBackends/D3D12/PerfQuery.h rename to Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h index 2173519a2c..3121da45d6 100644 --- a/Source/Core/VideoBackends/D3D12/PerfQuery.h +++ b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h @@ -5,7 +5,7 @@ #pragma once #include -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoCommon/PerfQueryBase.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/Renderer.cpp b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D12/Renderer.cpp rename to Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp index dc4ab47afb..ce9ac2504b 100644 --- a/Source/Core/VideoBackends/D3D12/Renderer.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp @@ -4,17 +4,17 @@ #include "Common/Logging/Log.h" -#include "VideoBackends/D3D12/BoundingBox.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/DXPipeline.h" -#include "VideoBackends/D3D12/DXShader.h" -#include "VideoBackends/D3D12/DXTexture.h" -#include "VideoBackends/D3D12/DXVertexFormat.h" +#include "VideoBackends/D3D12/D3D12BoundingBox.h" +#include "VideoBackends/D3D12/D3D12PerfQuery.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/D3D12SwapChain.h" +#include "VideoBackends/D3D12/DX12Context.h" +#include "VideoBackends/D3D12/DX12Pipeline.h" +#include "VideoBackends/D3D12/DX12Shader.h" +#include "VideoBackends/D3D12/DX12Texture.h" +#include "VideoBackends/D3D12/DX12VertexFormat.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/PerfQuery.h" -#include "VideoBackends/D3D12/Renderer.h" -#include "VideoBackends/D3D12/SwapChain.h" #include "VideoCommon/VideoConfig.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/Renderer.h b/Source/Core/VideoBackends/D3D12/D3D12Renderer.h similarity index 99% rename from Source/Core/VideoBackends/D3D12/Renderer.h rename to Source/Core/VideoBackends/D3D12/D3D12Renderer.h index fe985b7df5..4a26871a73 100644 --- a/Source/Core/VideoBackends/D3D12/Renderer.h +++ b/Source/Core/VideoBackends/D3D12/D3D12Renderer.h @@ -5,6 +5,7 @@ #pragma once #include +#include "VideoBackends/D3D12/DescriptorAllocator.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" #include "VideoCommon/RenderBase.h" diff --git a/Source/Core/VideoBackends/D3D12/StreamBuffer.cpp b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D12/StreamBuffer.cpp rename to Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp index a13b94fb16..d6dd5dc249 100644 --- a/Source/Core/VideoBackends/D3D12/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/StreamBuffer.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" #include #include @@ -11,7 +11,7 @@ #include "Common/Assert.h" #include "Common/MsgHandler.h" -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/StreamBuffer.h b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/StreamBuffer.h rename to Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.h diff --git a/Source/Core/VideoBackends/D3D12/SwapChain.cpp b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp similarity index 93% rename from Source/Core/VideoBackends/D3D12/SwapChain.cpp rename to Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp index 8435cc981d..b8ed3eff75 100644 --- a/Source/Core/VideoBackends/D3D12/SwapChain.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/SwapChain.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/DXTexture.h" +#include "VideoBackends/D3D12/D3D12SwapChain.h" +#include "VideoBackends/D3D12/DX12Context.h" +#include "VideoBackends/D3D12/DX12Texture.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/SwapChain.h b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/SwapChain.h rename to Source/Core/VideoBackends/D3D12/D3D12SwapChain.h diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.cpp b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D12/VertexManager.cpp rename to Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp index 66dafa533a..89ef13772b 100644 --- a/Source/Core/VideoBackends/D3D12/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp @@ -4,16 +4,16 @@ #include "Common/CommonTypes.h" -#include "VideoBackends/D3D12/VertexManager.h" +#include "VideoBackends/D3D12/D3D12VertexManager.h" #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/Renderer.h" -#include "VideoBackends/D3D12/StreamBuffer.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/IndexGenerator.h" diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.h b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h similarity index 97% rename from Source/Core/VideoBackends/D3D12/VertexManager.h rename to Source/Core/VideoBackends/D3D12/D3D12VertexManager.h index c609b49bd0..4e1837e89a 100644 --- a/Source/Core/VideoBackends/D3D12/VertexManager.h +++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h @@ -5,8 +5,8 @@ #pragma once #include +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/StreamBuffer.h" #include "VideoCommon/VertexManagerBase.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/DXContext.cpp b/Source/Core/VideoBackends/D3D12/DX12Context.cpp similarity index 99% rename from Source/Core/VideoBackends/D3D12/DXContext.cpp rename to Source/Core/VideoBackends/D3D12/DX12Context.cpp index 2fed2d611c..970fb1f94e 100644 --- a/Source/Core/VideoBackends/D3D12/DXContext.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Context.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" #include #include @@ -14,8 +14,8 @@ #include "Common/DynamicLibrary.h" #include "Common/StringUtil.h" #include "VideoBackends/D3D12/Common.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/StreamBuffer.h" #include "VideoCommon/VideoConfig.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/DXContext.h b/Source/Core/VideoBackends/D3D12/DX12Context.h similarity index 99% rename from Source/Core/VideoBackends/D3D12/DXContext.h rename to Source/Core/VideoBackends/D3D12/DX12Context.h index b19851741d..87e9839639 100644 --- a/Source/Core/VideoBackends/D3D12/DXContext.h +++ b/Source/Core/VideoBackends/D3D12/DX12Context.h @@ -9,9 +9,9 @@ #include "Common/CommonTypes.h" #include "VideoBackends/D3D12/Common.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" #include "VideoBackends/D3D12/DescriptorAllocator.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/StreamBuffer.h" struct IDXGIFactory; diff --git a/Source/Core/VideoBackends/D3D12/DXPipeline.cpp b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp similarity index 97% rename from Source/Core/VideoBackends/D3D12/DXPipeline.cpp rename to Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp index 089f13475e..dfce47a2fb 100644 --- a/Source/Core/VideoBackends/D3D12/DXPipeline.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp @@ -6,11 +6,11 @@ #include "Common/MsgHandler.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/DXPipeline.h" -#include "VideoBackends/D3D12/DXShader.h" -#include "VideoBackends/D3D12/DXTexture.h" -#include "VideoBackends/D3D12/DXVertexFormat.h" +#include "VideoBackends/D3D12/DX12Context.h" +#include "VideoBackends/D3D12/DX12Pipeline.h" +#include "VideoBackends/D3D12/DX12Shader.h" +#include "VideoBackends/D3D12/DX12Texture.h" +#include "VideoBackends/D3D12/DX12VertexFormat.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/DXPipeline.h b/Source/Core/VideoBackends/D3D12/DX12Pipeline.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/DXPipeline.h rename to Source/Core/VideoBackends/D3D12/DX12Pipeline.h diff --git a/Source/Core/VideoBackends/D3D12/DXShader.cpp b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp similarity index 94% rename from Source/Core/VideoBackends/D3D12/DXShader.cpp rename to Source/Core/VideoBackends/D3D12/DX12Shader.cpp index 856d0e8682..a8ce2bbd60 100644 --- a/Source/Core/VideoBackends/D3D12/DXShader.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/DXShader.h" +#include "VideoBackends/D3D12/DX12Shader.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/DXShader.h b/Source/Core/VideoBackends/D3D12/DX12Shader.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/DXShader.h rename to Source/Core/VideoBackends/D3D12/DX12Shader.h diff --git a/Source/Core/VideoBackends/D3D12/DXTexture.cpp b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp similarity index 99% rename from Source/Core/VideoBackends/D3D12/DXTexture.cpp rename to Source/Core/VideoBackends/D3D12/DX12Texture.cpp index fae8361da2..b9469b8d86 100644 --- a/Source/Core/VideoBackends/D3D12/DXTexture.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/DXTexture.h" +#include "VideoBackends/D3D12/DX12Texture.h" #include "Common/Align.h" #include "Common/Assert.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/D3D12StreamBuffer.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoBackends/D3D12/DescriptorHeapManager.h" -#include "VideoBackends/D3D12/Renderer.h" -#include "VideoBackends/D3D12/StreamBuffer.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/DXTexture.h b/Source/Core/VideoBackends/D3D12/DX12Texture.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/DXTexture.h rename to Source/Core/VideoBackends/D3D12/DX12Texture.h diff --git a/Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp similarity index 98% rename from Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp rename to Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp index 5d49810d19..1bd5ce23d5 100644 --- a/Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp +++ b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/D3D12/DXVertexFormat.h" +#include "VideoBackends/D3D12/DX12VertexFormat.h" #include "Common/Assert.h" diff --git a/Source/Core/VideoBackends/D3D12/DXVertexFormat.h b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.h similarity index 100% rename from Source/Core/VideoBackends/D3D12/DXVertexFormat.h rename to Source/Core/VideoBackends/D3D12/DX12VertexFormat.h diff --git a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp index 220099642c..afaec95a33 100644 --- a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp +++ b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "VideoBackends/D3D12/DescriptorAllocator.h" -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp index 8e515ecdd5..64fdc61f97 100644 --- a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp +++ b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp @@ -4,7 +4,7 @@ #include "VideoBackends/D3D12/DescriptorHeapManager.h" #include "Common/Assert.h" -#include "VideoBackends/D3D12/DXContext.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoCommon/VideoConfig.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp index af25c810c1..808935f74f 100644 --- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp +++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp @@ -10,11 +10,11 @@ #include "Core/ConfigManager.h" #include "VideoBackends/D3D12/Common.h" -#include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/PerfQuery.h" -#include "VideoBackends/D3D12/Renderer.h" -#include "VideoBackends/D3D12/SwapChain.h" -#include "VideoBackends/D3D12/VertexManager.h" +#include "VideoBackends/D3D12/D3D12PerfQuery.h" +#include "VideoBackends/D3D12/D3D12Renderer.h" +#include "VideoBackends/D3D12/D3D12SwapChain.h" +#include "VideoBackends/D3D12/D3D12VertexManager.h" +#include "VideoBackends/D3D12/DX12Context.h" #include "VideoBackends/D3D12/VideoBackend.h" #include "VideoCommon/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt index fa624d54b7..c3eb521252 100644 --- a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt +++ b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(videod3dcommon - Common.cpp - Common.h + D3DCommon.cpp + D3DCommon.h Shader.cpp Shader.h SwapChain.cpp diff --git a/Source/Core/VideoBackends/D3DCommon/Common.cpp b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp similarity index 99% rename from Source/Core/VideoBackends/D3DCommon/Common.cpp rename to Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp index 4b3f50ca8c..2142bf5ab0 100644 --- a/Source/Core/VideoBackends/D3DCommon/Common.cpp +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp @@ -11,7 +11,7 @@ #include "Common/DynamicLibrary.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/TextureConfig.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3DCommon/Common.h b/Source/Core/VideoBackends/D3DCommon/D3DCommon.h similarity index 100% rename from Source/Core/VideoBackends/D3DCommon/Common.h rename to Source/Core/VideoBackends/D3DCommon/D3DCommon.h diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters deleted file mode 100644 index 94fb9dd5a9..0000000000 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3DCommon/Shader.h b/Source/Core/VideoBackends/D3DCommon/Shader.h index 08158d6e1e..4958473ea3 100644 --- a/Source/Core/VideoBackends/D3DCommon/Shader.h +++ b/Source/Core/VideoBackends/D3DCommon/Shader.h @@ -6,7 +6,7 @@ #include #include -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/AbstractShader.h" namespace D3DCommon diff --git a/Source/Core/VideoBackends/D3DCommon/SwapChain.h b/Source/Core/VideoBackends/D3DCommon/SwapChain.h index 038bbe75e6..7a34f6db3a 100644 --- a/Source/Core/VideoBackends/D3DCommon/SwapChain.h +++ b/Source/Core/VideoBackends/D3DCommon/SwapChain.h @@ -9,7 +9,7 @@ #include "Common/CommonTypes.h" #include "Common/WindowSystemInfo.h" -#include "VideoBackends/D3DCommon/Common.h" +#include "VideoBackends/D3DCommon/D3DCommon.h" #include "VideoCommon/TextureConfig.h" namespace D3DCommon diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt index 6713f7d1c5..19f295950d 100644 --- a/Source/Core/VideoBackends/Null/CMakeLists.txt +++ b/Source/Core/VideoBackends/Null/CMakeLists.txt @@ -1,13 +1,13 @@ add_library(videonull NullBackend.cpp + NullRender.cpp + NullRender.h NullTexture.cpp NullTexture.h + NullVertexManager.cpp + NullVertexManager.h PerfQuery.h - Render.cpp - Render.h TextureCache.h - VertexManager.cpp - VertexManager.h VideoBackend.h ) diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj deleted file mode 100644 index b9001c2718..0000000000 --- a/Source/Core/VideoBackends/Null/Null.vcxproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp index ab061bc7d3..353cd67b0f 100644 --- a/Source/Core/VideoBackends/Null/NullBackend.cpp +++ b/Source/Core/VideoBackends/Null/NullBackend.cpp @@ -7,10 +7,10 @@ // This backend tries not to do anything in the backend, // but everything in VideoCommon. +#include "VideoBackends/Null/NullRender.h" +#include "VideoBackends/Null/NullVertexManager.h" #include "VideoBackends/Null/PerfQuery.h" -#include "VideoBackends/Null/Render.h" #include "VideoBackends/Null/TextureCache.h" -#include "VideoBackends/Null/VertexManager.h" #include "VideoBackends/Null/VideoBackend.h" #include "Common/Common.h" diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/NullRender.cpp similarity index 98% rename from Source/Core/VideoBackends/Null/Render.cpp rename to Source/Core/VideoBackends/Null/NullRender.cpp index 7e8719baf5..df99931908 100644 --- a/Source/Core/VideoBackends/Null/Render.cpp +++ b/Source/Core/VideoBackends/Null/NullRender.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Null/Render.h" +#include "VideoBackends/Null/NullRender.h" #include "VideoBackends/Null/NullTexture.h" diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/NullRender.h similarity index 100% rename from Source/Core/VideoBackends/Null/Render.h rename to Source/Core/VideoBackends/Null/NullRender.h diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/NullVertexManager.cpp similarity index 86% rename from Source/Core/VideoBackends/Null/VertexManager.cpp rename to Source/Core/VideoBackends/Null/NullVertexManager.cpp index 329f89a2a2..6828a0250e 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ b/Source/Core/VideoBackends/Null/NullVertexManager.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Null/VertexManager.h" +#include "VideoBackends/Null/NullVertexManager.h" namespace Null { diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/NullVertexManager.h similarity index 100% rename from Source/Core/VideoBackends/Null/VertexManager.h rename to Source/Core/VideoBackends/Null/NullVertexManager.h diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt index 2d80039fa5..8b4b27a571 100644 --- a/Source/Core/VideoBackends/OGL/CMakeLists.txt +++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt @@ -1,27 +1,27 @@ add_library(videoogl - BoundingBox.cpp - BoundingBox.h GPUTimer.h - main.cpp - NativeVertexFormat.cpp + OGLBoundingBox.cpp + OGLBoundingBox.h + OGLMain.cpp + OGLNativeVertexFormat.cpp + OGLPerfQuery.cpp + OGLPerfQuery.h OGLPipeline.cpp OGLPipeline.h + OGLRender.cpp + OGLRender.h OGLShader.cpp OGLShader.h + OGLStreamBuffer.cpp + OGLStreamBuffer.h OGLTexture.cpp OGLTexture.h - PerfQuery.cpp - PerfQuery.h + OGLVertexManager.cpp + OGLVertexManager.h ProgramShaderCache.cpp ProgramShaderCache.h - Render.cpp - Render.h SamplerCache.cpp SamplerCache.h - StreamBuffer.cpp - StreamBuffer.h - VertexManager.cpp - VertexManager.h VideoBackend.h ) diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj deleted file mode 100644 index 28f7152a06..0000000000 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - {EC1A314C-5588-4506-9C1E-2E58E5817F75} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters deleted file mode 100644 index 4077f05a37..0000000000 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters +++ /dev/null @@ -1,85 +0,0 @@ - - - - - {f29f8e7f-21ba-49da-8044-e5279a091c8f} - - - {5bfec41c-1031-4925-8f98-38c7b49b1924} - - - {696df73b-378e-4399-8f21-999b65d78dcd} - - - - - Decoder - - - Decoder - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - Render - - - Render - - - Render - - - - - Decoder - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - GLUtil - - - Render - - - Render - - - Render - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.cpp b/Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp similarity index 96% rename from Source/Core/VideoBackends/OGL/BoundingBox.cpp rename to Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp index 18ef7802cc..9e88767afc 100644 --- a/Source/Core/VideoBackends/OGL/BoundingBox.cpp +++ b/Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp @@ -6,8 +6,8 @@ #include "Common/GL/GLUtil.h" -#include "VideoBackends/OGL/BoundingBox.h" -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLBoundingBox.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.h b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h similarity index 100% rename from Source/Core/VideoBackends/OGL/BoundingBox.h rename to Source/Core/VideoBackends/OGL/OGLBoundingBox.h diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp similarity index 97% rename from Source/Core/VideoBackends/OGL/main.cpp rename to Source/Core/VideoBackends/OGL/OGLMain.cpp index 864de57624..894af140be 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp @@ -45,12 +45,12 @@ Make AA apply instantly during gameplay if possible #include "Core/Config/GraphicsSettings.h" -#include "VideoBackends/OGL/BoundingBox.h" -#include "VideoBackends/OGL/PerfQuery.h" +#include "VideoBackends/OGL/OGLBoundingBox.h" +#include "VideoBackends/OGL/OGLPerfQuery.h" +#include "VideoBackends/OGL/OGLRender.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" -#include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/VertexManager.h" #include "VideoBackends/OGL/VideoBackend.h" #include "VideoCommon/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp similarity index 96% rename from Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp rename to Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp index 6057c8878c..09114fb974 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp @@ -6,9 +6,9 @@ #include "Common/GL/GLUtil.h" #include "Common/MsgHandler.h" +#include "VideoBackends/OGL/OGLRender.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" -#include "VideoBackends/OGL/Render.h" -#include "VideoBackends/OGL/VertexManager.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp similarity index 98% rename from Source/Core/VideoBackends/OGL/PerfQuery.cpp rename to Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp index 83abe0d9b4..e708f93e10 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp +++ b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/OGL/PerfQuery.h" +#include "VideoBackends/OGL/OGLPerfQuery.h" #include #include "Common/CommonTypes.h" #include "Common/GL/GLExtensions/GLExtensions.h" -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/OGLPerfQuery.h similarity index 100% rename from Source/Core/VideoBackends/OGL/PerfQuery.h rename to Source/Core/VideoBackends/OGL/OGLPerfQuery.h diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp index 00ae8aa873..0d3ae7bf0a 100644 --- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp +++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp @@ -5,10 +5,10 @@ #include "Common/Assert.h" #include "VideoBackends/OGL/OGLPipeline.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoBackends/OGL/OGLShader.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" -#include "VideoBackends/OGL/Render.h" -#include "VideoBackends/OGL/VertexManager.h" #include "VideoCommon/VideoConfig.h" namespace OGL diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/OGLRender.cpp similarity index 99% rename from Source/Core/VideoBackends/OGL/Render.cpp rename to Source/Core/VideoBackends/OGL/OGLRender.cpp index 042aaeaaa0..6b99327fee 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/OGLRender.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" #include #include @@ -22,13 +22,13 @@ #include "Core/Config/GraphicsSettings.h" -#include "VideoBackends/OGL/BoundingBox.h" +#include "VideoBackends/OGL/OGLBoundingBox.h" #include "VideoBackends/OGL/OGLPipeline.h" #include "VideoBackends/OGL/OGLShader.h" #include "VideoBackends/OGL/OGLTexture.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/VertexManager.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/DriverDetails.h" diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/OGLRender.h similarity index 100% rename from Source/Core/VideoBackends/OGL/Render.h rename to Source/Core/VideoBackends/OGL/OGLRender.h diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp similarity index 99% rename from Source/Core/VideoBackends/OGL/StreamBuffer.cpp rename to Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp index b59d08b4f1..b389b2951f 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/OGL/StreamBuffer.h" +#include "VideoBackends/OGL/OGLStreamBuffer.h" #include "Common/Align.h" #include "Common/GL/GLUtil.h" #include "Common/MathUtil.h" #include "Common/MemoryUtil.h" -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h similarity index 100% rename from Source/Core/VideoBackends/OGL/StreamBuffer.h rename to Source/Core/VideoBackends/OGL/OGLStreamBuffer.h diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp similarity index 98% rename from Source/Core/VideoBackends/OGL/VertexManager.cpp rename to Source/Core/VideoBackends/OGL/OGLVertexManager.cpp index 7d14e76dd9..5436938524 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/OGL/VertexManager.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include #include @@ -14,9 +14,9 @@ #include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoBackends/OGL/OGLPipeline.h" +#include "VideoBackends/OGL/OGLRender.h" +#include "VideoBackends/OGL/OGLStreamBuffer.h" #include "VideoBackends/OGL/ProgramShaderCache.h" -#include "VideoBackends/OGL/Render.h" -#include "VideoBackends/OGL/StreamBuffer.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/Statistics.h" diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/OGLVertexManager.h similarity index 100% rename from Source/Core/VideoBackends/OGL/VertexManager.h rename to Source/Core/VideoBackends/OGL/OGLVertexManager.h diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index e4afbf0ccd..23a2b9fb44 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -21,10 +21,10 @@ #include "Core/ConfigManager.h" +#include "VideoBackends/OGL/OGLRender.h" #include "VideoBackends/OGL/OGLShader.h" -#include "VideoBackends/OGL/Render.h" -#include "VideoBackends/OGL/StreamBuffer.h" -#include "VideoBackends/OGL/VertexManager.h" +#include "VideoBackends/OGL/OGLStreamBuffer.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoCommon/AsyncShaderCompiler.h" #include "VideoCommon/GeometryShaderManager.h" diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp index 364ec51c99..bec6316b04 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.cpp +++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" #include diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index 8c7ee5ca7b..af4d50041b 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -10,7 +10,7 @@ #include "Common/CommonTypes.h" #include "Common/GL/GLUtil.h" -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" namespace OGL { diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj deleted file mode 100644 index 68c9e2132e..0000000000 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - {A4C423AA-F57C-46C7-A172-D1A777017D29} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index 40966f191d..74127f3aba 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -1,36 +1,36 @@ add_library(videovulkan - BoundingBox.cpp - BoundingBox.h CommandBufferManager.cpp CommandBufferManager.h Constants.h - main.cpp ObjectCache.cpp ObjectCache.h - PerfQuery.cpp - PerfQuery.h - Renderer.cpp - Renderer.h ShaderCompiler.cpp ShaderCompiler.h - StateTracker.cpp - StateTracker.h StagingBuffer.cpp StagingBuffer.h - StreamBuffer.cpp - StreamBuffer.h - SwapChain.cpp - SwapChain.h - VertexFormat.cpp - VertexFormat.h - VertexManager.cpp - VertexManager.h + StateTracker.cpp + StateTracker.h + VKBoundingBox.cpp + VKBoundingBox.h + VKMain.cpp + VKPerfQuery.cpp + VKPerfQuery.h VKPipeline.cpp VKPipeline.h + VKRenderer.cpp + VKRenderer.h VKShader.cpp VKShader.h + VKStreamBuffer.cpp + VKStreamBuffer.h + VKSwapChain.cpp + VKSwapChain.h VKTexture.cpp VKTexture.h + VKVertexFormat.cpp + VKVertexFormat.h + VKVertexManager.cpp + VKVertexManager.h VulkanContext.cpp VulkanContext.h VulkanLoader.cpp diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp index 8a532e1f24..645a57b7e6 100644 --- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp @@ -18,9 +18,9 @@ #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ShaderCompiler.h" -#include "VideoBackends/Vulkan/StreamBuffer.h" +#include "VideoBackends/Vulkan/VKStreamBuffer.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp index 53081c4be2..dc898413a3 100644 --- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp +++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp @@ -8,11 +8,11 @@ #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/VKPipeline.h" +#include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VKShader.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/BoundingBox.cpp b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/BoundingBox.cpp rename to Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp index d16cabfd30..5412d5cb06 100644 --- a/Source/Core/VideoBackends/Vulkan/BoundingBox.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp @@ -7,12 +7,12 @@ #include "Common/Assert.h" #include "Common/Logging/Log.h" -#include "VideoBackends/Vulkan/BoundingBox.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StagingBuffer.h" #include "VideoBackends/Vulkan/StateTracker.h" +#include "VideoBackends/Vulkan/VKBoundingBox.h" +#include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/BoundingBox.h b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/BoundingBox.h rename to Source/Core/VideoBackends/Vulkan/VKBoundingBox.h diff --git a/Source/Core/VideoBackends/Vulkan/main.cpp b/Source/Core/VideoBackends/Vulkan/VKMain.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/main.cpp rename to Source/Core/VideoBackends/Vulkan/VKMain.cpp index b3b3008006..37cc754449 100644 --- a/Source/Core/VideoBackends/Vulkan/main.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKMain.cpp @@ -10,11 +10,11 @@ #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/Constants.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/PerfQuery.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StateTracker.h" -#include "VideoBackends/Vulkan/SwapChain.h" -#include "VideoBackends/Vulkan/VertexManager.h" +#include "VideoBackends/Vulkan/VKPerfQuery.h" +#include "VideoBackends/Vulkan/VKRenderer.h" +#include "VideoBackends/Vulkan/VKSwapChain.h" +#include "VideoBackends/Vulkan/VKVertexManager.h" #include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoBackends/Vulkan/VulkanContext.h" diff --git a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/PerfQuery.cpp rename to Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp index 4b449fdf7d..c8fcd05842 100644 --- a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Vulkan/PerfQuery.h" +#include "VideoBackends/Vulkan/VKPerfQuery.h" #include #include @@ -13,8 +13,8 @@ #include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StateTracker.h" +#include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/PerfQuery.h b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/PerfQuery.h rename to Source/Core/VideoBackends/Vulkan/VKPerfQuery.h diff --git a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp index 0152b67921..b7c656bec9 100644 --- a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp @@ -12,7 +12,7 @@ #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoBackends/Vulkan/VKShader.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/Renderer.cpp rename to Source/Core/VideoBackends/Vulkan/VKRenderer.cpp index 68c6777599..b2f3f45072 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKRenderer.cpp @@ -16,18 +16,18 @@ #include "Core/Core.h" -#include "VideoBackends/Vulkan/BoundingBox.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/PerfQuery.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StateTracker.h" -#include "VideoBackends/Vulkan/StreamBuffer.h" -#include "VideoBackends/Vulkan/SwapChain.h" +#include "VideoBackends/Vulkan/VKBoundingBox.h" +#include "VideoBackends/Vulkan/VKPerfQuery.h" #include "VideoBackends/Vulkan/VKPipeline.h" +#include "VideoBackends/Vulkan/VKRenderer.h" #include "VideoBackends/Vulkan/VKShader.h" +#include "VideoBackends/Vulkan/VKStreamBuffer.h" +#include "VideoBackends/Vulkan/VKSwapChain.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/DriverDetails.h" diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.h b/Source/Core/VideoBackends/Vulkan/VKRenderer.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/Renderer.h rename to Source/Core/VideoBackends/Vulkan/VKRenderer.h diff --git a/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp similarity index 99% rename from Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp rename to Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp index ee86615090..864fabf831 100644 --- a/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Vulkan/StreamBuffer.h" +#include "VideoBackends/Vulkan/VKStreamBuffer.h" #include #include diff --git a/Source/Core/VideoBackends/Vulkan/StreamBuffer.h b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/StreamBuffer.h rename to Source/Core/VideoBackends/Vulkan/VKStreamBuffer.h diff --git a/Source/Core/VideoBackends/Vulkan/SwapChain.cpp b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp similarity index 99% rename from Source/Core/VideoBackends/Vulkan/SwapChain.cpp rename to Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp index f16a7c3bd0..8928b60806 100644 --- a/Source/Core/VideoBackends/Vulkan/SwapChain.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Vulkan/SwapChain.h" +#include "VideoBackends/Vulkan/VKSwapChain.h" #include #include diff --git a/Source/Core/VideoBackends/Vulkan/SwapChain.h b/Source/Core/VideoBackends/Vulkan/VKSwapChain.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/SwapChain.h rename to Source/Core/VideoBackends/Vulkan/VKSwapChain.h diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index 66ec56c57c..17039191cb 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -14,10 +14,10 @@ #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StagingBuffer.h" #include "VideoBackends/Vulkan/StateTracker.h" -#include "VideoBackends/Vulkan/StreamBuffer.h" +#include "VideoBackends/Vulkan/VKRenderer.h" +#include "VideoBackends/Vulkan/VKStreamBuffer.h" #include "VideoBackends/Vulkan/VKTexture.h" #include "VideoBackends/Vulkan/VulkanContext.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/VertexFormat.cpp rename to Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp index 5d8006c2c0..c458e04121 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "Common/Assert.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.h b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/VertexFormat.h rename to Source/Core/VideoBackends/Vulkan/VKVertexFormat.h diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp similarity index 98% rename from Source/Core/VideoBackends/Vulkan/VertexManager.cpp rename to Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp index 30ba8e2bad..27c88c88ae 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/Vulkan/VertexManager.h" +#include "VideoBackends/Vulkan/VKVertexManager.h" #include "Common/Align.h" #include "Common/CommonTypes.h" @@ -10,10 +10,10 @@ #include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StateTracker.h" -#include "VideoBackends/Vulkan/StreamBuffer.h" -#include "VideoBackends/Vulkan/VertexFormat.h" +#include "VideoBackends/Vulkan/VKRenderer.h" +#include "VideoBackends/Vulkan/VKStreamBuffer.h" +#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/GeometryShaderManager.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.h b/Source/Core/VideoBackends/Vulkan/VKVertexManager.h similarity index 100% rename from Source/Core/VideoBackends/Vulkan/VertexManager.h rename to Source/Core/VideoBackends/Vulkan/VKVertexManager.h diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj deleted file mode 100644 index f92f3678a9..0000000000 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - {29F29A19-F141-45AD-9679-5A2923B49DA3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {d178061b-84d3-44f9-beed-efd18d9033f0} - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 9c822cc276..cbb2566470 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -18,10 +18,10 @@ #include #include "Common/CommonPaths.h" -#include "Common/File.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/Flag.h" +#include "Common/IOFile.h" #include "Common/Image.h" #include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" diff --git a/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp b/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp index 43a5c61630..ca3613748e 100644 --- a/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp +++ b/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp @@ -11,7 +11,7 @@ #include #include "Common/Align.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Swap.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index f281ff5a87..fbba9fc12f 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -39,11 +39,11 @@ #include "Common/Thread.h" #include "Common/Timer.h" -#include "Core/Analytics.h" #include "Core/Config/NetplaySettings.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/FifoPlayer/FifoRecorder.h" #include "Core/FreeLookConfig.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/VideoCommon/ShaderCache.h b/Source/Core/VideoCommon/ShaderCache.h index d97d1c5014..c55df27cd0 100644 --- a/Source/Core/VideoCommon/ShaderCache.h +++ b/Source/Core/VideoCommon/ShaderCache.h @@ -15,7 +15,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/LinearDiskCache.h" #include "VideoCommon/AbstractPipeline.h" diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index ae694868aa..59d351018f 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -14,8 +14,8 @@ #include "Common/Logging/Log.h" #include "Common/MathUtil.h" -#include "Core/Analytics.h" #include "Core/ConfigManager.h" +#include "Core/DolphinAnalytics.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/BoundingBox.h" diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj deleted file mode 100644 index ecfc6b2def..0000000000 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} - - - - - - - - - - - - - - HAS_OPENGL;%(PreprocessorDefinitions) - - - - - HAS_VULKAN;%(PreprocessorDefinitions) - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - true - - - - true - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {677EA016-1182-440C-9345-DC88D1E98C0C} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters deleted file mode 100644 index 96d76b5646..0000000000 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ /dev/null @@ -1,408 +0,0 @@ - - - - - {23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9} - - - {2baa29c2-a528-4981-abcb-e0842c311f63} - - - {6a88e4a0-754c-43df-98e6-405c99cd2ca7} - - - {7ce5076f-4e85-4f4d-b3f0-8c88267b8b2d} - - - {8c17624b-2ccb-4ee4-9ec0-593f8f3d1dd2} - - - {8edd4982-cce6-406e-9029-f7a6449311b1} - - - {cefc166b-1f5e-4e96-863d-1448e14c0741} - - - - - - - - - - Base - - - Base - - - Base - - - Base - - - Base - - - Decoding - - - Decoding - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Managers - - - Shader Managers - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Decoding - - - Decoding - - - Util - - - Util - - - Shader Generators - - - Shader Managers - - - Shader Generators - - - Util - - - Base - - - Base - - - Shader Generators - - - Util - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Base - - - Shader Generators - - - Shader Generators - - - Base - - - Util - - - Util - - - Decoding - - - Vertex Loading - - - - - - - - - - - - Base - - - Base - - - Base - - - Base - - - Base - - - Decoding - - - Decoding - - - Decoding - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Managers - - - Shader Managers - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Util - - - Util - - - Shader Generators - - - Shader Managers - - - Util - - - Base - - - Base - - - Util - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Base - - - Base - - - Base - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Shader Generators - - - Util - - - Util - - - Vertex Loading - - - - - - diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj index 772239e360..b550b5f107 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj @@ -24,14 +24,27 @@ - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {B001D13E-7EAB-4689-842D-801E5ACFFAC5} + + {c636d9d1-82fe-42b5-9987-63b7d4836341} + + + {bb00605c-125f-4a21-b33b-7bf418322dcb} + + + {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} + + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 2256a856aa..59c5f2bc3d 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -35,11 +35,8 @@ - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {e54cf649-140e-4255-81a5-30a673c1fb36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index d828e23389..f758af5bed 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -82,31 +82,14 @@ - - {E54CF649-140E-4255-81A5-30A673C1FB36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {604c8368-f34a-4d55-82c8-cc92a0c13254} - - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29F29A19-F141-45AD-9679-5A2923B49DA3} + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 4502479713..0f31f47801 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -5,19 +5,15 @@ VisualStudioVersion = 16.0.29519.181 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinQt\DolphinQt.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinNoGUI", "Core\DolphinNoGUI\DolphinNoGUI.vcxproj", "{974E563D-23F8-4E8F-9083-F62876B04E08}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{160BDC25-5626-4B0D-BDD8-2953D9777FB5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinLib", "Core\DolphinLib.vcxproj", "{D79392F7-06D6-4B4B-A39F-4D587C215D3A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{6BBD47CF-91FD-4077-B676-8B76980178A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UICommon", "Core\UICommon\UICommon.vcxproj", "{604C8368-F34A-4D55-82C8-CC92A0C13254}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinUpdater", "Core\WinUpdater\WinUpdater.vcxproj", "{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{87ADDFF9-5768-4DA2-A33B-2477593D6677}" EndProject @@ -25,8 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\External EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin Core", "Dolphin Core", "{15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{AB993F38-C31D-4897-B139-A620C42BC565}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{31643FDB-1BB8-4965-9DE7-000FC88D35AE}" @@ -45,26 +39,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SC EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D", "Core\VideoBackends\D3D\D3D.vcxproj", "{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGL", "Core\VideoBackends\OGL\OGL.vcxproj", "{EC1A314C-5588-4506-9C1E-2E58E5817F75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Software", "Core\VideoBackends\Software\Software.vcxproj", "{A4C423AA-F57C-46C7-A172-D1A777017D29}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Null", "Core\VideoBackends\Null\Null.vcxproj", "{53A5391B-737E-49A8-BC8F-312ADA00736F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vulkan", "Core\VideoBackends\Vulkan\Vulkan.vcxproj", "{29F29A19-F141-45AD-9679-5A2923B49DA3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Video Backends", "Video Backends", "{AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb-1.0.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "PCH\pch.vcxproj", "{76563A7F-1011-4EAD-B667-7BB18D09568E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "..\Externals\enet\enet.vcxproj", "{CBC76802-C128-4B17-BF6C-23B08C313E5E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "..\Externals\curl\curl.vcxproj", "{BB00605C-125F-4A21-B33B-7BF418322DCB}" @@ -79,9 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml", "..\Externals\pug EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picojson", "..\Externals\picojson\picojson.vcxproj", "{2C0D058E-DE35-4471-AD99-E68A2CAF9E18}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed25519", "..\externals\ed25519\ed25519.vcxproj", "{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinUpdater", "Core\WinUpdater\WinUpdater.vcxproj", "{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed25519", "..\Externals\ed25519\ed25519.vcxproj", "{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSurround", "..\Externals\FreeSurround\FreeSurround.vcxproj", "{8498F2FA-5CA6-4169-9971-DE5B1FE6132C}" EndProject @@ -91,14 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "..\Externals\min EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui", "..\Externals\imgui\imgui.vcxproj", "{4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdaterCommon", "Core\UpdaterCommon\UpdaterCommon.vcxproj", "{B001D13E-7EAB-4689-842D-801E5ACFFAC5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12", "Core\VideoBackends\D3D12\D3D12.vcxproj", "{570215B7-E32F-4438-95AE-C8D955F9FCA3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3DCommon", "Core\VideoBackends\D3DCommon\D3DCommon.vcxproj", "{DEA96CF2-F237-4A1A-B32F-C916769EFB50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinNoGUI", "Core\DolphinNoGUI\DolphinNoGUI.vcxproj", "{974E563D-23F8-4E8F-9083-F62876B04E08}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\Externals\bzip2\bzip2.vcxproj", "{1D8C51D2-FFA4-418E-B183-9F42B6A6717E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "..\Externals\liblzma\liblzma.vcxproj", "{055A775F-B4F5-4970-9240-F6CF7661F37B}" @@ -121,62 +89,42 @@ Global {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|ARM64.Build.0 = Release|ARM64 {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.ActiveCfg = Release|x64 {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.Build.0 = Release|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|ARM64.Build.0 = Debug|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.ActiveCfg = Debug|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.Build.0 = Debug|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|ARM64.ActiveCfg = Release|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|ARM64.Build.0 = Release|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.ActiveCfg = Release|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.Build.0 = Release|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|ARM64.Build.0 = Debug|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.ActiveCfg = Debug|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.Build.0 = Debug|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|ARM64.ActiveCfg = Release|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|ARM64.Build.0 = Release|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.ActiveCfg = Release|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.Build.0 = Release|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|ARM64.Build.0 = Debug|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.ActiveCfg = Debug|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.Build.0 = Debug|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|ARM64.ActiveCfg = Release|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|ARM64.Build.0 = Release|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.ActiveCfg = Release|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.Build.0 = Release|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|ARM64.Build.0 = Debug|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.ActiveCfg = Debug|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.Build.0 = Debug|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|ARM64.ActiveCfg = Release|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|ARM64.Build.0 = Release|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.ActiveCfg = Release|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.Build.0 = Release|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|ARM64.Build.0 = Debug|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.ActiveCfg = Debug|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.Build.0 = Debug|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|ARM64.ActiveCfg = Release|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|ARM64.Build.0 = Release|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.ActiveCfg = Release|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.Build.0 = Release|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|ARM64.Build.0 = Debug|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.ActiveCfg = Debug|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.Build.0 = Debug|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|ARM64.ActiveCfg = Release|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|ARM64.Build.0 = Release|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.ActiveCfg = Release|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.Build.0 = Release|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|ARM64.Build.0 = Debug|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.ActiveCfg = Debug|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.Build.0 = Debug|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|ARM64.ActiveCfg = Release|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|ARM64.Build.0 = Release|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.ActiveCfg = Release|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.Build.0 = Release|x64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|x64.ActiveCfg = Debug|x64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|ARM64.ActiveCfg = Release|ARM64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|x64.ActiveCfg = Release|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.Build.0 = Debug|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.ActiveCfg = Release|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.Build.0 = Release|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.Build.0 = Debug|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.ActiveCfg = Debug|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.ActiveCfg = Release|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.Build.0 = Release|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|ARM64.Build.0 = Debug|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|x64.ActiveCfg = Debug|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|x64.Build.0 = Debug|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|ARM64.ActiveCfg = Release|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|ARM64.Build.0 = Release|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|x64.ActiveCfg = Release|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|x64.Build.0 = Release|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.Build.0 = Debug|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.ActiveCfg = Debug|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.Build.0 = Debug|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.ActiveCfg = Release|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.Build.0 = Release|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.ActiveCfg = Release|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.Build.0 = Release|x64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|ARM64.Build.0 = Debug|ARM64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|x64.ActiveCfg = Debug|x64 @@ -273,50 +221,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|ARM64.Build.0 = Release|ARM64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.Build.0 = Debug|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.ActiveCfg = Release|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.Build.0 = Release|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|ARM64.Build.0 = Debug|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.ActiveCfg = Debug|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.Build.0 = Debug|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|ARM64.ActiveCfg = Release|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|ARM64.Build.0 = Release|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.ActiveCfg = Release|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.Build.0 = Release|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.ActiveCfg = Debug|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.Build.0 = Debug|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|ARM64.ActiveCfg = Release|ARM64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.ActiveCfg = Release|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.Build.0 = Release|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.ActiveCfg = Debug|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.Build.0 = Debug|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|ARM64.ActiveCfg = Release|ARM64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.ActiveCfg = Release|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.Build.0 = Release|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|ARM64.Build.0 = Debug|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|x64.ActiveCfg = Debug|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|x64.Build.0 = Debug|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|ARM64.ActiveCfg = Release|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|ARM64.Build.0 = Release|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|x64.ActiveCfg = Release|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|x64.Build.0 = Release|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|ARM64.Build.0 = Debug|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|x64.ActiveCfg = Debug|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|x64.Build.0 = Debug|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|ARM64.ActiveCfg = Release|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|ARM64.Build.0 = Release|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|x64.ActiveCfg = Release|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|x64.Build.0 = Release|x64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|ARM64.Build.0 = Debug|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.ActiveCfg = Debug|x64 @@ -325,14 +229,6 @@ Global {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|ARM64.Build.0 = Release|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.ActiveCfg = Release|x64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.Build.0 = Release|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.Build.0 = Debug|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.ActiveCfg = Debug|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.ActiveCfg = Release|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.Build.0 = Release|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|ARM64.Build.0 = Debug|ARM64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|x64.ActiveCfg = Debug|x64 @@ -397,14 +293,6 @@ Global {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|ARM64.Build.0 = Release|ARM64 {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|x64.ActiveCfg = Release|x64 {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|x64.Build.0 = Release|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.Build.0 = Debug|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.ActiveCfg = Debug|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.Build.0 = Debug|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.ActiveCfg = Release|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.Build.0 = Release|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.ActiveCfg = Release|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.Build.0 = Release|x64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|ARM64.Build.0 = Debug|ARM64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|x64.ActiveCfg = Debug|x64 @@ -437,34 +325,6 @@ Global {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|ARM64.Build.0 = Release|ARM64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.ActiveCfg = Release|x64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.Build.0 = Release|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|ARM64.Build.0 = Debug|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|x64.ActiveCfg = Debug|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|x64.Build.0 = Debug|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|ARM64.ActiveCfg = Release|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|ARM64.Build.0 = Release|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|x64.ActiveCfg = Release|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|x64.Build.0 = Release|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|ARM64.Build.0 = Debug|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.ActiveCfg = Debug|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.Build.0 = Debug|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|ARM64.ActiveCfg = Release|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|ARM64.Build.0 = Release|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.ActiveCfg = Release|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.Build.0 = Release|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|ARM64.Build.0 = Debug|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|x64.ActiveCfg = Debug|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|x64.Build.0 = Debug|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|ARM64.ActiveCfg = Release|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|ARM64.Build.0 = Release|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|x64.ActiveCfg = Release|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|x64.Build.0 = Release|x64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|x64.ActiveCfg = Debug|x64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|ARM64.ActiveCfg = Release|ARM64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|x64.ActiveCfg = Release|x64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.Build.0 = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|x64.ActiveCfg = Debug|x64 @@ -494,13 +354,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E54CF649-140E-4255-81A5-30A673C1FB36} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {160BDC25-5626-4B0D-BDD8-2953D9777FB5} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {6BBD47CF-91FD-4077-B676-8B76980178A9} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {604C8368-F34A-4D55-82C8-CC92A0C13254} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {AB993F38-C31D-4897-B139-A620C42BC565} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {31643FDB-1BB8-4965-9DE7-000FC88D35AE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} @@ -511,13 +364,6 @@ Global {BDB6578B-0691-4E80-A46C-DF21639FD3B8} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {EC1A314C-5588-4506-9C1E-2E58E5817F75} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {53A5391B-737E-49A8-BC8F-312ADA00736F} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {29F29A19-F141-45AD-9679-5A2923B49DA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {CBC76802-C128-4B17-BF6C-23B08C313E5E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {BB00605C-125F-4A21-B33B-7BF418322DCB} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {D178061B-84D3-44F9-BEED-EFD18D9033F0} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} @@ -530,8 +376,6 @@ Global {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {23114507-079A-4418-9707-CFA81A03CA99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} - {570215B7-E32F-4438-95AE-C8D955F9FCA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {DEA96CF2-F237-4A1A-B32F-C916769EFB50} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {1D8C51D2-FFA4-418E-B183-9F42B6A6717E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {055A775F-B4F5-4970-9240-F6CF7661F37B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {1BEA10F3-80CE-4BC4-9331-5769372CDF99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}