287 Source/Core/Common/Common.vcxproj
View file

This file was deleted.

380 Source/Core/Common/Common.vcxproj.filters
View file

This file was deleted.

2 Source/Core/Common/FileUtil.cpp
View file
@@ -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
2 Source/Core/Common/File.cpp → Source/Core/Common/IOFile.cpp
View file
@@ -22,8 +22,8 @@
#endif

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/FileUtil.h"
#include "Common/IOFile.h"

namespace File
{
0 Source/Core/Common/File.h → Source/Core/Common/IOFile.h
View file
File renamed without changes.
2 Source/Core/Common/Image.cpp
View file
@@ -10,7 +10,7 @@
#include <png.h>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"

namespace Common
{
2 Source/Core/Common/JitRegister.cpp
View file
@@ -13,7 +13,7 @@
#include <fmt/format.h>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
2 Source/Core/Common/LinearDiskCache.h
View file
@@ -11,7 +11,7 @@
#include <type_traits>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/Version.h"

// On disk format:
2 Source/Core/Common/PcapFile.cpp
View file
@@ -5,7 +5,7 @@
#include <chrono>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/PcapFile.h"

namespace Common
2 Source/Core/Common/PcapFile.h
View file
@@ -17,7 +17,7 @@
#include <memory>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"

namespace Common
{
2 Source/Core/Common/SDCardUtil.cpp
View file
@@ -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
2 Source/Core/Core/Boot/Boot.cpp
View file
@@ -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"
2 Source/Core/Core/Boot/DolReader.cpp
View file
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>

#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/Swap.h"
#include "Core/HW/Memmap.h"

2 Source/Core/Core/Boot/ElfReader.cpp
View file
@@ -8,7 +8,7 @@
#include <utility>

#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"
272 Source/Core/Core/CMakeLists.txt
View file

Large diffs are not rendered by default.

2 Source/Core/Core/ConfigManager.cpp
View file
@@ -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"
2 Source/Core/Core/Core.cpp
View file
@@ -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"
745 Source/Core/Core/Core.vcxproj
View file

This file was deleted.

1,764 Source/Core/Core/Core.vcxproj.filters
View file

This file was deleted.

2 Source/Core/Core/DSP/DSPCaptureLogger.cpp
View file
@@ -9,7 +9,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/PcapFile.h"

namespace DSP
2 Source/Core/Core/DSP/DSPCodeUtil.cpp
View file
@@ -12,8 +12,8 @@
#include <fmt/format.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"
2 Source/Core/Core/Debugger/Dump.cpp
View file
@@ -8,7 +8,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"

CDump::CDump(const std::string& filename) : m_pData(nullptr)
{
2 Source/Core/Core/Analytics.cpp → Source/Core/Core/DolphinAnalytics.cpp
View file
@@ -1,4 +1,4 @@
#include "Core/Analytics.h"
#include "Core/DolphinAnalytics.h"

#include <array>
#include <memory>
0 Source/Core/Core/Analytics.h → Source/Core/Core/DolphinAnalytics.h
View file
File renamed without changes.
2 Source/Core/Core/FifoPlayer/FifoDataFile.cpp
View file
@@ -10,7 +10,7 @@
#include <string>
#include <vector>

#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/MsgHandler.h"
#include "Core/Config/MainSettings.h"
#include "Core/HW/Memmap.h"
2 Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
View file
@@ -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"
2 Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp
View file
@@ -7,7 +7,7 @@
#include <cinttypes>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"

#include "Core/DSP/DSPCore.h"

2 Source/Core/Core/HW/DVD/DVDInterface.cpp
View file
@@ -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"
2 Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
View file
@@ -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"
2 Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
View file
@@ -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"
2 Source/Core/Core/HW/GCMemcard/GCIFile.cpp
View file
@@ -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
2 Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
View file
@@ -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"
2 Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View file
@@ -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"
2 Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp
View file
@@ -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"
2 Source/Core/Core/HW/GCPad.h
View file
@@ -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;
2 Source/Core/Core/HW/Sram.cpp
View file
@@ -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"
2 Source/Core/Core/HW/WiiSave.cpp
View file
@@ -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"
2 Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View file
@@ -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"
10 Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View file
@@ -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();
}

2 Source/Core/Core/IOS/DI/DI.cpp
View file
@@ -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"
2 Source/Core/Core/IOS/DolphinDevice.cpp
View file
@@ -6,8 +6,8 @@
#include <cstring>

#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"
0 Source/Core/Core/IOS/FS/FileSystem.cpp → Source/Core/Core/IOS/FS/FileSystemCommon.cpp
View file
File renamed without changes.
2 Source/Core/Core/IOS/FS/HostBackend/FS.h
View file
@@ -11,7 +11,7 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Core/IOS/FS/FileSystem.h"

namespace IOS::HLE::FS
2 Source/Core/Core/IOS/FS/HostBackend/File.cpp
View file
@@ -5,8 +5,8 @@
#include <algorithm>
#include <memory>

#include "Common/File.h"
#include "Common/FileUtil.h"
#include "Common/IOFile.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"

2 Source/Core/Core/IOS/IOSC.cpp
View file
@@ -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"
2 Source/Core/Core/IOS/Network/SSL.cpp
View file
@@ -12,8 +12,8 @@
#include <mbedtls/md.h>
#include <mbedtls/sha256.h>

#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"
2 Source/Core/Core/IOS/Network/Socket.cpp
View file
@@ -17,8 +17,8 @@
#include <sys/select.h>
#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"
2 Source/Core/Core/IOS/Network/WD/Command.cpp
View file
@@ -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"

2 Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
View file
@@ -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"
2 Source/Core/Core/IOS/SDIO/SDIOSlot0.h
View file
@@ -10,7 +10,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Core/IOS/Device.h"
#include "Core/IOS/IOS.h"

2 Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
View file
@@ -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"

2 Source/Core/Core/IOS/WFS/WFSI.cpp
View file
@@ -13,8 +13,8 @@
#include <fmt/format.h>

#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"
2 Source/Core/Core/IOS/WFS/WFSSRV.cpp
View file
@@ -10,8 +10,8 @@
#include <vector>

#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"
2 Source/Core/Core/IOS/WFS/WFSSRV.h
View file
@@ -8,7 +8,7 @@
#include <vector>

#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"
2 Source/Core/Core/Movie.cpp
View file
@@ -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"
2 Source/Core/Core/NetPlayClient.cpp
View file
@@ -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"
2 Source/Core/Core/NetPlayServer.cpp
View file
@@ -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"
2 Source/Core/Core/PowerPC/Jit64/Jit.cpp
View file
@@ -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"
2 Source/Core/Core/PowerPC/JitInterface.cpp
View file
@@ -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"
2 Source/Core/Core/PowerPC/PPCCache.cpp
View file
@@ -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"
2 Source/Core/Core/PowerPC/PPCSymbolDB.cpp
View file
@@ -15,7 +15,7 @@
#include <fmt/format.h>

#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"
2 Source/Core/Core/PowerPC/PPCTables.cpp
View file
@@ -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"

2 Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp
View file
@@ -10,8 +10,8 @@

#include <fmt/format.h>

#include "Common/File.h"
#include "Common/FileUtil.h"
#include "Common/IOFile.h"
#include "Common/Logging/Log.h"

// CSV separated with tabs
2 Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp
View file
@@ -9,7 +9,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/Logging/Log.h"

namespace
2 Source/Core/Core/State.cpp
View file
@@ -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"
2 Source/Core/Core/SysConf.cpp
View file
@@ -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"
2 Source/Core/Core/WiiRoot.cpp
View file
@@ -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"
2 Source/Core/DiscIO/Blob.cpp
View file
@@ -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"
2 Source/Core/DiscIO/CISOBlob.cpp
View file
@@ -8,7 +8,7 @@
#include <utility>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/CISOBlob.h"

namespace DiscIO
2 Source/Core/DiscIO/CISOBlob.h
View file
@@ -9,7 +9,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

namespace DiscIO
2 Source/Core/DiscIO/CompressedBlob.cpp
View file
@@ -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"
2 Source/Core/DiscIO/CompressedBlob.h
View file
@@ -18,7 +18,7 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

namespace DiscIO
2 Source/Core/DiscIO/DirectoryBlob.cpp
View file
@@ -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"
2 Source/Core/DiscIO/DiscExtractor.cpp
View file
@@ -11,8 +11,8 @@
#include <fmt/format.h>

#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"
106 Source/Core/DiscIO/DiscIO.vcxproj
View file

This file was deleted.

191 Source/Core/DiscIO/DiscIO.vcxproj.filters
View file

This file was deleted.

2 Source/Core/DiscIO/DriveBlob.cpp
View file
@@ -10,7 +10,7 @@
#include <vector>

#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"
2 Source/Core/DiscIO/DriveBlob.h
View file
@@ -8,7 +8,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

#ifdef _WIN32
2 Source/Core/DiscIO/FileBlob.h
View file
@@ -9,7 +9,7 @@
#include <string>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

namespace DiscIO
2 Source/Core/DiscIO/FileSystemGCWii.cpp
View file
@@ -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"
2 Source/Core/DiscIO/NANDImporter.cpp
View file
@@ -11,8 +11,8 @@
#include <fmt/format.h>

#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"
2 Source/Core/DiscIO/TGCBlob.cpp
View file
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>

#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/Swap.h"

namespace
2 Source/Core/DiscIO/TGCBlob.h
View file
@@ -9,7 +9,7 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

namespace DiscIO
2 Source/Core/DiscIO/VolumeVerifier.cpp
View file
@@ -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"
2 Source/Core/DiscIO/WIABlob.cpp
View file
@@ -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"
2 Source/Core/DiscIO/WIABlob.h
View file
@@ -13,7 +13,7 @@
#include <utility>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "Common/Swap.h"
#include "DiscIO/Blob.h"
#include "DiscIO/MultithreadedCompressor.h"
2 Source/Core/DiscIO/WbfsBlob.cpp
View file
@@ -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"

2 Source/Core/DiscIO/WbfsBlob.h
View file
@@ -9,7 +9,7 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/IOFile.h"
#include "DiscIO/Blob.h"

namespace DiscIO
2 Source/Core/DiscIO/WiiSaveBanner.cpp
View file
@@ -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"

35 Source/Core/DolphinLib.ARM64.props
View file
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="Common\Arm64Emitter.h" />
<ClInclude Include="Common\ArmCommon.h" />
<ClInclude Include="Core\PowerPC\JitArm64\Jit_Util.h" />
<ClInclude Include="Core\PowerPC\JitArm64\Jit.h" />
<ClInclude Include="Core\PowerPC\JitArm64\JitArm64_RegCache.h" />
<ClInclude Include="Core\PowerPC\JitArm64\JitArm64Cache.h" />
<ClInclude Include="Core\PowerPC\JitArmCommon\BackPatch.h" />
<ClInclude Include="VideoCommon\VertexLoaderARM64.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Common\Arm64Emitter.cpp" />
<ClCompile Include="Common\ArmCPUDetect.cpp" />
<ClCompile Include="Common\GenericFPURoundMode.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\Jit_Util.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\Jit.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_BackPatch.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_Branch.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_FloatingPoint.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_Integer.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_LoadStore.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_LoadStoreFloating.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_LoadStorePaired.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_Paired.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_RegCache.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_SystemRegisters.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64_Tables.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitArm64Cache.cpp" />
<ClCompile Include="Core\PowerPC\JitArm64\JitAsm.cpp" />
<ClCompile Include="VideoCommon\TextureDecoder_Generic.cpp" />
<ClCompile Include="VideoCommon\VertexLoaderARM64.cpp" />
</ItemGroup>
</Project>
1,201 Source/Core/DolphinLib.props
View file

Large diffs are not rendered by default.

30 ...VideoBackends/D3DCommon/D3DCommon.vcxproj → Source/Core/DolphinLib.vcxproj
View file
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\VSProps\Base.Macros.props" />
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\VSProps\Base.Macros.props" />
<Import Project="$(VSPropsDir)Base.Targets.props" />
<PropertyGroup Label="Globals">
<ProjectGuid>{DEA96CF2-F237-4A1A-B32F-C916769EFB50}</ProjectGuid>
<ProjectGuid>{d79392f7-06d6-4b4b-a39f-4d587c215d3a}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
@@ -15,22 +15,18 @@
<Import Project="$(VSPropsDir)PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="DolphinLib.props" />
<ImportGroup Condition="'$(Platform)'=='x64'">
<Import Project="DolphinLib.x64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Platform)'=='ARM64'">
<Import Project="DolphinLib.ARM64.props" />
</ImportGroup>
<ItemGroup>
<ClCompile Include="Common.cpp" />
<ClCompile Include="Shader.cpp" />
<ClCompile Include="SwapChain.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Common.h" />
<ClInclude Include="Shader.h" />
<ClInclude Include="SwapChain.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
<ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="ExtensionTargets" />
</Project>
6 Source/Core/DolphinLib.vcxproj.user
View file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
</PropertyGroup>
</Project>
54 Source/Core/DolphinLib.x64.props
View file
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="Common\x64ABI.h" />
<ClInclude Include="Common\x64Emitter.h" />
<ClInclude Include="Common\x64Reg.h" />
<ClInclude Include="Core\PowerPC\Jit64\Jit.h" />
<ClInclude Include="Core\PowerPC\Jit64\JitAsm.h" />
<ClInclude Include="Core\PowerPC\Jit64\RegCache\CachedReg.h" />
<ClInclude Include="Core\PowerPC\Jit64\RegCache\FPURegCache.h" />
<ClInclude Include="Core\PowerPC\Jit64\RegCache\GPRRegCache.h" />
<ClInclude Include="Core\PowerPC\Jit64\RegCache\JitRegCache.h" />
<ClInclude Include="Core\PowerPC\Jit64\RegCache\RCMode.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\BlockCache.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\ConstantPool.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\EmuCodeBlock.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\FarCodeCache.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\Jit64AsmCommon.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\Jit64Constants.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\Jit64PowerPCState.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\TrampolineCache.h" />
<ClInclude Include="Core\PowerPC\Jit64Common\TrampolineInfo.h" />
<ClInclude Include="VideoCommon\VertexLoaderX64.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Common\x64ABI.cpp" />
<ClCompile Include="Common\x64CPUDetect.cpp" />
<ClCompile Include="Common\x64Emitter.cpp" />
<ClCompile Include="Common\x64FPURoundMode.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_Branch.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_Integer.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_LoadStore.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_Paired.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\Jit64_Tables.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\JitAsm.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\RegCache\FPURegCache.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\RegCache\GPRRegCache.cpp" />
<ClCompile Include="Core\PowerPC\Jit64\RegCache\JitRegCache.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\BlockCache.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\ConstantPool.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\EmuCodeBlock.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\FarCodeCache.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\Jit64AsmCommon.cpp" />
<ClCompile Include="Core\PowerPC\Jit64Common\TrampolineCache.cpp" />
<ClCompile Include="VideoCommon\FrameDump.cpp" />
<ClCompile Include="VideoCommon\TextureDecoder_x64.cpp" />
<ClCompile Include="VideoCommon\VertexLoaderX64.cpp" />
</ItemGroup>
</Project>
37 Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
View file
@@ -24,40 +24,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
<Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
<ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
<Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
<Project>{604c8368-f34a-4d55-82c8-cc92a0c13254}</Project>
<ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
<Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\D3D12\D3D12.vcxproj">
<Project>{570215b7-e32f-4438-95ae-c8d955f9fca3}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Null\Null.vcxproj">
<Project>{53a5391b-737e-49a8-bc8f-312ada00736f}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj" Condition="'$(Platform)'!='ARM64'">
<Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj" Condition="'$(Platform)'!='ARM64'">
<Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Vulkan\Vulkan.vcxproj">
<Project>{29f29a19-f141-45ad-9679-5a2923b49da3}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)cpp-optparse\cpp-optparse.vcxproj">
<Project>{c636d9d1-82fe-42b5-9987-63b7d4836341}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)discord-rpc\src\discord-rpc.vcxproj">
<Project>{4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD}</Project>
<ProjectReference Include="$(DolphinRootDir)Languages\Languages.vcxproj">
<Project>{0e033be3-2e08-428e-9ae9-bc673efa12b5}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(ExternalsDir)ExternalsReferenceAll.props" />
<ItemGroup>
<ClCompile Include="MainNoGUI.cpp" />
<ClCompile Include="Platform.cpp" />
2 Source/Core/DolphinNoGUI/MainNoGUI.cpp
View file
@@ -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"
2 Source/Core/DolphinQt/Config/Mapping/IOWindow.h
View file
@@ -12,7 +12,7 @@
#include <QSyntaxHighlighter>

#include "Common/Flag.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

class ControlReference;
class MappingWidget;
2 Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
View file
@@ -7,7 +7,7 @@
#include <string>
#include <vector>

#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

class QString;
class OutputReference;
2 Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
View file
@@ -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"
2 Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
View file
@@ -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/";
2 Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
View file
@@ -8,7 +8,7 @@
#include <QString>
#include <memory>

#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ControllerEmu
{
2 Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
View file
@@ -20,8 +20,8 @@
#include <QTableWidget>
#include <QVBoxLayout>

#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"
62 Source/Core/DolphinQt/DolphinQt.vcxproj
View file
@@ -358,73 +358,17 @@
<ResourceCompile Include="DolphinQt.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
<Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
<Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
<ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
<Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
<Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
<Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
<Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
<Project>{604C8368-F34A-4D55-82C8-CC92A0C13254}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
<Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\D3D12\D3D12.vcxproj">
<Project>{570215b7-e32f-4438-95ae-c8d955f9fca3}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Null\Null.vcxproj">
<Project>{53A5391B-737E-49A8-BC8F-312ADA00736F}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj" Condition="'$(Platform)'!='ARM64'">
<Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj" Condition="'$(Platform)'!='ARM64'">
<Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoBackends\Vulkan\Vulkan.vcxproj">
<Project>{29f29a19-f141-45ad-9679-5a2923b49da3}</Project>
</ProjectReference>
<ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
</ProjectReference>
<ProjectReference Include="$(DolphinRootDir)Languages\Languages.vcxproj">
<Project>{0e033be3-2e08-428e-9ae9-bc673efa12b5}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
<Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)discord-rpc\src\discord-rpc.vcxproj">
<Project>{4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)imgui\imgui.vcxproj">
<Project>{4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
<Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
<Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
<Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(ExternalsDir)ExternalsReferenceAll.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
2 Source/Core/DolphinQt/Main.cpp
View file
@@ -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"
2 Source/Core/DolphinQt/Settings/GeneralPane.cpp
View file
@@ -16,11 +16,11 @@
#include <QVBoxLayout>
#include <QWidget>

#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"
2 Source/Core/DolphinQt/Translation.cpp
View file
@@ -12,8 +12,8 @@
#include <iterator>
#include <string>

#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"
8 Source/Core/InputCommon/CMakeLists.txt
View file
@@ -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
2 Source/Core/InputCommon/ControlReference/ControlReference.h
View file
@@ -8,7 +8,7 @@
#include <memory>

#include "InputCommon/ControlReference/ExpressionParser.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

// ControlReference
//
2 Source/Core/InputCommon/ControlReference/ExpressionParser.h
View file
@@ -9,7 +9,7 @@
#include <optional>
#include <string>

#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ciface::ExpressionParser
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
View file
@@ -8,7 +8,7 @@
#include <string>

#include "InputCommon/ControllerEmu/StickGate.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ControllerEmu
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
View file
@@ -7,7 +7,7 @@
#include <string>
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ControllerEmu
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
View file
@@ -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;
2 Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
View file
@@ -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
{
2 Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View file
@@ -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
2 ...nputCommon/ControllerInterface/Device.cpp → ...Common/ControllerInterface/CoreDevice.cpp
View file
@@ -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 <algorithm>
#include <cmath>
0 .../InputCommon/ControllerInterface/Device.h → ...utCommon/ControllerInterface/CoreDevice.h
View file
File renamed without changes.
2 Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
View file
@@ -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
2 Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
View file
@@ -7,8 +7,8 @@
#include <windows.h>

#include "Common/Matrix.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/ControllerInterface/DInput/DInput8.h"
#include "InputCommon/ControllerInterface/Device.h"

namespace ciface::DInput
{
2 Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
View file
@@ -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 <Windows.h>
2 Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
View file
@@ -8,7 +8,7 @@

#include <IOKit/hid/IOHIDLib.h>

#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

namespace ciface::OSX
2 Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
View file
@@ -7,7 +7,7 @@
#include <QuartzCore/QuartzCore.h>

#include "Common/Matrix.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ciface::Quartz
{
2 Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View file
@@ -14,7 +14,7 @@
#include <SDL_haptic.h>
#endif

#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"

namespace ciface::SDL
{
6 ...n/ControllerInterface/Wiimote/Wiimote.cpp → ...erInterface/Wiimote/WiimoteController.cpp
View file
@@ -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
6 ...mon/ControllerInterface/Wiimote/Wiimote.h → ...llerInterface/Wiimote/WiimoteController.h
View file
@@ -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 @@ class Device final : public Core::Device
Clock::time_point m_last_report_time = Clock::now();
};

} // namespace ciface::Wiimote
} // namespace ciface::WiimoteController
2 Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp
View file
@@ -12,8 +12,8 @@
#include <picojson.h>

#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"
2 Source/Core/InputCommon/ImageOperations.cpp
View file
@@ -11,8 +11,8 @@
#include <string>
#include <vector>

#include "Common/File.h"
#include "Common/FileUtil.h"
#include "Common/IOFile.h"
#include "Common/Image.h"

namespace InputCommon
116 Source/Core/InputCommon/InputCommon.vcxproj
View file

This file was deleted.