From d296f0257f2397206e3c40108b779a4c777d8b60 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Tue, 28 Apr 2020 00:34:08 -0400 Subject: [PATCH] recording: Removed redundant #includes and reliance on Common.h Including Common.h was excessive (for logging) and causing compiler errors on MSVCv142, this bypasses that issue. The only references to something similar to the errors I was seeing was this https://developercommunity.visualstudio.com/content/problem/845325/stdmake-shared-pch-virtual-method-googletest-cause.html which is resolved in the upcoming VS - 16.6 release (16.5 at the time of writing) --- pcsx2/Recording/InputRecording.cpp | 8 ++---- pcsx2/Recording/InputRecording.h | 4 +-- pcsx2/Recording/InputRecordingFile.cpp | 6 ++-- pcsx2/Recording/PadData.cpp | 6 ++-- pcsx2/Recording/VirtualPad/VirtualPad.cpp | 28 +++++++++---------- pcsx2/Recording/VirtualPad/VirtualPad.h | 13 +-------- pcsx2/Recording/VirtualPad/VirtualPadData.h | 2 +- .../VirtualPad/VirtualPadResources.cpp | 4 ++- .../VirtualPad/VirtualPadResources.h | 10 +------ 9 files changed, 29 insertions(+), 52 deletions(-) diff --git a/pcsx2/Recording/InputRecording.cpp b/pcsx2/Recording/InputRecording.cpp index 0ca595956d..31d4d52b30 100644 --- a/pcsx2/Recording/InputRecording.cpp +++ b/pcsx2/Recording/InputRecording.cpp @@ -15,18 +15,16 @@ #include "PrecompiledHeader.h" +#include + #include "AppSaveStates.h" #include "AppGameDatabase.h" -#include "Common.h" +#include "DebugTools/Debug.h" #include "Counters.h" -#include "MemoryTypes.h" -#include "SaveState.h" #include "InputRecording.h" #include "InputRecordingControls.h" -#include - void SaveStateBase::InputRecordingFreeze() { diff --git a/pcsx2/Recording/InputRecording.h b/pcsx2/Recording/InputRecording.h index 8ebf519913..875b07cb2f 100644 --- a/pcsx2/Recording/InputRecording.h +++ b/pcsx2/Recording/InputRecording.h @@ -15,10 +15,9 @@ #pragma once -#include "InputRecordingFile.h" +#include "Recording/InputRecordingFile.h" -#ifndef DISABLE_RECORDING class InputRecording { public: @@ -118,4 +117,3 @@ private: }; extern InputRecording g_InputRecording; -#endif diff --git a/pcsx2/Recording/InputRecordingFile.cpp b/pcsx2/Recording/InputRecordingFile.cpp index c36f0524ca..ade7a7801e 100644 --- a/pcsx2/Recording/InputRecordingFile.cpp +++ b/pcsx2/Recording/InputRecordingFile.cpp @@ -15,13 +15,11 @@ #include "PrecompiledHeader.h" -#include "App.h" -#include "Common.h" -#include "Counters.h" +#include "DebugTools/Debug.h" #include "MainFrame.h" #include "MemoryTypes.h" -#include "InputRecordingFile.h" +#include "Recording/InputRecordingFile.h" #ifndef DISABLE_RECORDING diff --git a/pcsx2/Recording/PadData.cpp b/pcsx2/Recording/PadData.cpp index 85d5592375..e4107391a5 100644 --- a/pcsx2/Recording/PadData.cpp +++ b/pcsx2/Recording/PadData.cpp @@ -15,9 +15,9 @@ #include "PrecompiledHeader.h" -#include "Common.h" -#include "ConsoleLogger.h" -#include "PadData.h" +#include "DebugTools/Debug.h" + +#include "Recording/PadData.h" void PadData::UpdateControllerData(u16 bufIndex, u8 const &bufVal) { diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.cpp b/pcsx2/Recording/VirtualPad/VirtualPad.cpp index e46460b3f3..74ec45e7bb 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.cpp +++ b/pcsx2/Recording/VirtualPad/VirtualPad.cpp @@ -15,34 +15,34 @@ #include "PrecompiledHeader.h" -#include "math.h" +#include #include "App.h" -#include "Common.h" -#include "MSWstuff.h" +#include "Utilities/EmbeddedImage.h" +#include "wx/display.h" +#include "wx/dcbuffer.h" +#include "wx/spinctrl.h" #include "Recording/VirtualPad/VirtualPad.h" #include "Recording/VirtualPad/VirtualPadResources.h" -#include "Recording/VirtualPad/img/controller.h" - #include "Recording/VirtualPad/img/circlePressed.h" +#include "Recording/VirtualPad/img/controller.h" #include "Recording/VirtualPad/img/crossPressed.h" -#include "Recording/VirtualPad/img/squarePressed.h" -#include "Recording/VirtualPad/img/trianglePressed.h" #include "Recording/VirtualPad/img/downPressed.h" -#include "Recording/VirtualPad/img/leftPressed.h" -#include "Recording/VirtualPad/img/rightPressed.h" -#include "Recording/VirtualPad/img/upPressed.h" #include "Recording/VirtualPad/img/l1Pressed.h" #include "Recording/VirtualPad/img/l2Pressed.h" +#include "Recording/VirtualPad/img/l3Pressed.h" +#include "Recording/VirtualPad/img/leftPressed.h" #include "Recording/VirtualPad/img/r1Pressed.h" #include "Recording/VirtualPad/img/r2Pressed.h" - -#include "Recording/VirtualPad/img/selectPressed.h" -#include "Recording/VirtualPad/img/startPressed.h" -#include "Recording/VirtualPad/img/l3Pressed.h" #include "Recording/VirtualPad/img/r3Pressed.h" +#include "Recording/VirtualPad/img/rightPressed.h" +#include "Recording/VirtualPad/img/selectPressed.h" +#include "Recording/VirtualPad/img/squarePressed.h" +#include "Recording/VirtualPad/img/startPressed.h" +#include "Recording/VirtualPad/img/trianglePressed.h" +#include "Recording/VirtualPad/img/upPressed.h" // TODO - store position of frame in ini file? diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.h b/pcsx2/Recording/VirtualPad/VirtualPad.h index 71c4e4e622..e67c71f5bc 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.h +++ b/pcsx2/Recording/VirtualPad/VirtualPad.h @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2019 PCSX2 Dev Team + * Copyright (C) 2002-2020 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -18,19 +18,8 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "Utilities/EmbeddedImage.h" - #include "Recording/PadData.h" - #include "Recording/VirtualPad/VirtualPadData.h" -#include "Recording/VirtualPad/VirtualPadResources.h" class VirtualPad : public wxFrame { diff --git a/pcsx2/Recording/VirtualPad/VirtualPadData.h b/pcsx2/Recording/VirtualPad/VirtualPadData.h index a30fb3562b..2365f0dba7 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPadData.h +++ b/pcsx2/Recording/VirtualPad/VirtualPadData.h @@ -15,8 +15,8 @@ #pragma once -#include "Recording/VirtualPad/VirtualPadResources.h" #include "Recording/PadData.h" +#include "Recording/VirtualPad/VirtualPadResources.h" class VirtualPadData { diff --git a/pcsx2/Recording/VirtualPad/VirtualPadResources.cpp b/pcsx2/Recording/VirtualPad/VirtualPadResources.cpp index 5dd8189884..fec70cb5f5 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPadResources.cpp +++ b/pcsx2/Recording/VirtualPad/VirtualPadResources.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs -* Copyright (C) 2002-2019 PCSX2 Dev Team +* Copyright (C) 2002-2020 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -15,6 +15,8 @@ #include "PrecompiledHeader.h" +#include + #include "Recording/VirtualPad/VirtualPadResources.h" void ControllerNormalButton::UpdateGuiElement(std::queue *renderQueue, bool &clearScreenRequired) diff --git a/pcsx2/Recording/VirtualPad/VirtualPadResources.h b/pcsx2/Recording/VirtualPad/VirtualPadResources.h index 9e3790b542..4795dafbff 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPadResources.h +++ b/pcsx2/Recording/VirtualPad/VirtualPadResources.h @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs -* Copyright (C) 2002-2019 PCSX2 Dev Team +* Copyright (C) 2002-2020 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -17,14 +17,6 @@ #include -#include -#include -#include -#include -#include - -#include "Common.h" - struct ImageFile { wxBitmap image;