ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Tyler Wilding 2020-04-28 00:34:08 -04:00 committed by refractionpcsx2
parent ed829d427c
commit d296f0257f
9 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/Recording/InputRecording.cpp
View File

@ -15,18 +15,16 @@
#include "PrecompiledHeader.h"
#include <vector>
#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 <vector>
void SaveStateBase::InputRecordingFreeze()
{

4
pcsx2/Recording/InputRecording.h
View File

@ -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

6
pcsx2/Recording/InputRecordingFile.cpp
View File

@ -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

6
pcsx2/Recording/PadData.cpp
View File

@ -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)
{

28
pcsx2/Recording/VirtualPad/VirtualPad.cpp
View File

@ -15,34 +15,34 @@
#include "PrecompiledHeader.h"
#include "math.h"
#include <math.h>
#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?

13
pcsx2/Recording/VirtualPad/VirtualPad.h
View File

@ -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 <map>
#include <queue>
#include <wx/wx.h>
#include <wx/display.h>
#include <wx/tglbtn.h>
#include <wx/spinctrl.h>
#include <wx/dcbuffer.h>
#include <wx/event.h>
#include "Utilities/EmbeddedImage.h"
#include "Recording/PadData.h"
#include "Recording/VirtualPad/VirtualPadData.h"
#include "Recording/VirtualPad/VirtualPadResources.h"
class VirtualPad : public wxFrame
{

2
pcsx2/Recording/VirtualPad/VirtualPadData.h
View File

@ -15,8 +15,8 @@
#pragma once
#include "Recording/VirtualPad/VirtualPadResources.h"
#include "Recording/PadData.h"
#include "Recording/VirtualPad/VirtualPadResources.h"
class VirtualPadData
{

4
pcsx2/Recording/VirtualPad/VirtualPadResources.cpp
View File

@ -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 <wx/spinctrl.h>
#include "Recording/VirtualPad/VirtualPadResources.h"
void ControllerNormalButton::UpdateGuiElement(std::queue<VirtualPadElement*> *renderQueue, bool &clearScreenRequired)

10
pcsx2/Recording/VirtualPad/VirtualPadResources.h
View File

@ -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 <queue>
#include <wx/wx.h>
#include <wx/tglbtn.h>
#include <wx/spinctrl.h>
#include <wx/dcbuffer.h>
#include <wx/event.h>
#include "Common.h"
struct ImageFile
{
wxBitmap image;