Don't randomly include "stdafx.h"

It's file for precompiled headers.
Include what is used, don't rely on transitive includes.
This commit is contained in:
Nekotekina 2020-12-22 11:42:57 +03:00
parent 41ee792f95
commit b7bf316c1a
96 changed files with 235 additions and 85 deletions

View file

@ -1,6 +1,8 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <string>
enum class cheat_type : u8 enum class cheat_type : u8
{ {

View file

@ -7,7 +7,9 @@
#include "util/dyn_lib.hpp" #include "util/dyn_lib.hpp"
#ifdef _WIN32 #ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#include <time.h> #include <time.h>
#elif __linux__ #elif __linux__

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include "Utilities/StrFmt.h"
enum : u32 enum : u32
{ {

View file

@ -2,6 +2,7 @@
#error "XAudio2 can only be built on Windows." #error "XAudio2 can only be built on Windows."
#endif #endif
#include <algorithm>
#include "util/logs.hpp" #include "util/logs.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "Emu/System.h" #include "Emu/System.h"

View file

@ -1,9 +1,14 @@
#pragma once #pragma once
#include "util/types.hpp"
#include "util/atomic.hpp"
#include "Utilities/BitField.h" #include "Utilities/BitField.h"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include <string>
#include <functional>
enum enum
{ {
CELL_MSGDIALOG_PROGRESSBAR_STRING_SIZE = 64, CELL_MSGDIALOG_PROGRESSBAR_STRING_SIZE = 64,

View file

@ -1,6 +1,10 @@
#pragma once #pragma once
#include "util/types.hpp"
#include "util/atomic.hpp"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include <string>
#include <functional>
// error codes // error codes
enum CellOskDialogError : u32 enum CellOskDialogError : u32

View file

@ -1,7 +1,10 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <Emu/Memory/vm_ptr.h> #include "util/endian.hpp"
#include "Emu/Memory/vm_ptr.h"
#include <string>
#include <vector>
// Return codes // Return codes
enum CellSaveDataError : u32 enum CellSaveDataError : u32

View file

@ -1,8 +1,10 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "util/endian.hpp"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include <vector>
// Error codes // Error codes
enum SceNpTrophyError : u32 enum SceNpTrophyError : u32

View file

@ -4,6 +4,7 @@
#include "../Memory/vm_ptr.h" #include "../Memory/vm_ptr.h"
#include "Utilities/lockless.h" #include "Utilities/lockless.h"
#include "util/logs.hpp"
#include "util/v128.hpp" #include "util/v128.hpp"
LOG_CHANNEL(ppu_log, "PPU"); LOG_CHANNEL(ppu_log, "PPU");

View file

@ -7,6 +7,7 @@
#include <map> #include <map>
#include "util/v128.hpp" #include "util/v128.hpp"
#include "util/logs.hpp"
#include "util/to_endian.hpp" #include "util/to_endian.hpp"
LOG_CHANNEL(spu_log, "SPU"); LOG_CHANNEL(spu_log, "SPU");

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <list> #include <list>
#include <algorithm>
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include "util/init_mutex.hpp" #include "util/init_mutex.hpp"

View file

@ -1,5 +1,8 @@
#pragma once #pragma once
#include "util/types.hpp"
#include "util/atomic.hpp"
namespace input namespace input
{ {
extern atomic_t<bool> g_intercepted; extern atomic_t<bool> g_intercepted;

View file

@ -1,5 +1,9 @@
#pragma once #pragma once
#include "util/types.hpp"
#include <vector>
enum SystemInfo enum SystemInfo
{ {
CELL_PAD_INFO_INTERCEPTED = 0x00000001 CELL_PAD_INFO_INTERCEPTED = 0x00000001

View file

@ -3,6 +3,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include "util/types.hpp" #include "util/types.hpp"
#include "util/atomic.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "util/to_endian.hpp" #include "util/to_endian.hpp"

View file

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <sstream>
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/RSX/GL/GLVertexProgram.h" #include "Emu/RSX/GL/GLVertexProgram.h"
#include "Emu/RSX/GL/GLFragmentProgram.h" #include "Emu/RSX/GL/GLFragmentProgram.h"
#include "Utilities/File.h"
using CGprofile = be_t<u32>; using CGprofile = be_t<u32>;
using CGbool = be_t<s32>; using CGbool = be_t<s32>;

View file

@ -15,6 +15,7 @@
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "Utilities/File.h"
#include "util/logs.hpp" #include "util/logs.hpp"
#include "util/asm.hpp" #include "util/asm.hpp"

View file

@ -1,8 +1,9 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "GLHelpers.h" #include "GLHelpers.h"
#include "../Overlays/overlays.h" #include "../Overlays/overlays.h"
#include <string>
extern u64 get_system_time(); extern u64 get_system_time();

View file

@ -1,8 +1,10 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "GLHelpers.h" #include "GLHelpers.h"
#include "../Common/TextGlyphs.h" #include "../Common/TextGlyphs.h"
#include <string>
#include <vector>
namespace gl namespace gl
{ {

View file

@ -1,10 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "GLRenderTargets.h" #include "GLRenderTargets.h"
#include "../Common/texture_cache.h" #include "../Common/texture_cache.h"
#include <memory>
#include <vector>
class GLGSRender; class GLGSRender;
namespace gl namespace gl

View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "util/types.hpp"
#include "util/atomic.hpp"
#include <memory> #include <memory>
#include <vector>
#include "display.h" #include "display.h"

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include "util/logs.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "Utilities/File.h" #include "Utilities/File.h"
#include "overlay_utils.h" #include "overlay_utils.h"

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <string> #include <string>
#include <functional> #include <functional>
#include <vector> #include <vector>

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "VKHelpers.h" #include "VKHelpers.h"
#include "VKFormats.h" #include "VKFormats.h"
#include "../Common/surface_store.h" #include "../Common/surface_store.h"

View file

@ -1,10 +1,14 @@
#pragma once #pragma once
#include "stdafx.h"
#include "util/types.hpp"
#include "VKRenderTargets.h" #include "VKRenderTargets.h"
#include "VKResourceManager.h" #include "VKResourceManager.h"
#include "VKDMA.h" #include "VKDMA.h"
#include "../Common/texture_cache.h" #include "../Common/texture_cache.h"
#include <memory>
#include <vector>
extern u64 get_system_time(); extern u64 get_system_time();
namespace vk namespace vk

View file

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "util/atomic.hpp"
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector>
u64 get_system_time(); u64 get_system_time();
u64 get_guest_system_time(); u64 get_guest_system_time();

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Io/KeyboardHandler.h" #include "Emu/Io/KeyboardHandler.h"
#include <QKeyEvent> #include <QKeyEvent>

View file

@ -1,6 +1,9 @@
#include <QApplication> #include <QApplication>
#include <QCursor> #include <QCursor>
#include "util/types.hpp"
#include "util/logs.hpp"
#include "basic_mouse_handler.h" #include "basic_mouse_handler.h"
#include "rpcs3qt/gs_frame.h" #include "rpcs3qt/gs_frame.h"
#include "Emu/Io/interception.h" #include "Emu/Io/interception.h"

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Io/MouseHandler.h" #include "Emu/Io/MouseHandler.h"
#include <QWindow> #include <QWindow>

View file

@ -1,10 +1,12 @@
#pragma once #pragma once
#ifdef HAVE_LIBEVDEV #ifdef HAVE_LIBEVDEV
#include "stdafx.h" #include "util/types.hpp"
#include "Utilities/File.h" #include "Utilities/File.h"
#include "Emu/Io/PadHandler.h" #include "Emu/Io/PadHandler.h"
#include <libevdev/libevdev.h> #include <libevdev/libevdev.h>
#include <memory>
#include <unordered_map>
#include <vector> #include <vector>
#include <thread> #include <thread>
#include <ctime> #include <ctime>

View file

@ -1,10 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Io/PadHandler.h" #include "Emu/Io/PadHandler.h"
#include <QWindow> #include <QWindow>
#include <QKeyEvent> #include <QKeyEvent>
#include <string>
#include <vector>
#include <unordered_map>
enum mouse enum mouse
{ {

View file

@ -1,10 +1,18 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Io/PadHandler.h" #include "Emu/Io/PadHandler.h"
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <string>
#include <vector>
#include <memory>
#include <unordered_map>
class mm_joystick_handler final : public PadHandlerBase class mm_joystick_handler final : public PadHandlerBase
{ {
// Unique names for the config files and our pad settings dialog // Unique names for the config files and our pad settings dialog

View file

@ -1,12 +1,15 @@
#pragma once #pragma once
#include "util/types.hpp"
#include "util/atomic.hpp"
#include "Emu/Io/pad_types.h"
#include "Emu/Io/pad_config_types.h"
#include <map> #include <map>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <string_view>
#include "stdafx.h" #include <string>
#include "Emu/Io/pad_types.h"
#include "Emu/Io/pad_config_types.h"
class PadHandlerBase; class PadHandlerBase;

View file

@ -1,7 +1,9 @@
#pragma once #pragma once
#include "Emu/Io/PadHandler.h" #include "Emu/Io/PadHandler.h"
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#include <Xinput.h> #include <Xinput.h>
#include <chrono> #include <chrono>

View file

@ -1,8 +1,15 @@
#pragma once #pragma once
#include "util/types.hpp"
#include <map> #include <map>
#include <string>
#include <string_view> #include <string_view>
namespace fs
{
class file;
}
namespace psf namespace psf
{ {
enum class format : u16 enum class format : u16

View file

@ -2,7 +2,7 @@
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /constexpr:steps16777216 /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /constexpr:steps16777216 /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1 /D _HAS_EXCEPTIONS=0 /MT") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D NOMINMAX /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1 /D _HAS_EXCEPTIONS=0 /MT")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED")

View file

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "stdafx.h"
#include <QCoreApplication> #include <QCoreApplication>
#include "main_application.h" #include "main_application.h"
#include <functional>
/** Headless RPCS3 Application Class /** Headless RPCS3 Application Class
* The main point of this class is to do application initialization and initialize callbacks. * The main point of this class is to do application initialization and initialize callbacks.
*/ */

View file

@ -39,6 +39,7 @@ DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResoluti
#include "Utilities/Config.h" #include "Utilities/Config.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Utilities/File.h"
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include "Emu/System.h" #include "Emu/System.h"
#include <thread> #include <thread>

View file

@ -1,5 +1,9 @@
#include "main_application.h" #include "main_application.h"
#include "util/types.hpp"
#include "util/logs.hpp"
#include "util/atomic.hpp"
#include "Input/pad_thread.h" #include "Input/pad_thread.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"

View file

@ -1,9 +1,11 @@
#ifdef WITH_DISCORD_RPC #ifdef WITH_DISCORD_RPC
#include "stdafx.h"
#include "_discord_utils.h" #include "_discord_utils.h"
#include "discord_rpc.h" #include "discord_rpc.h"
#include "discord_register.h" #include "discord_register.h"
#include <string>
#include <ctime>
namespace discord namespace discord
{ {
void initialize(const std::string& application_id) void initialize(const std::string& application_id)
@ -27,7 +29,7 @@ namespace discord
if (reset_timer) if (reset_timer)
{ {
discordPresence.startTimestamp = time(0); discordPresence.startTimestamp = std::time(0);
} }
Discord_UpdatePresence(&discordPresence); Discord_UpdatePresence(&discordPresence);

View file

@ -8,6 +8,9 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>
#include "util/logs.hpp"
#include "Utilities/File.h"
LOG_CHANNEL(autopause_log, "AutoPause"); LOG_CHANNEL(autopause_log, "AutoPause");
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;

View file

@ -1,11 +1,12 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QLabel> #include <QLabel>
#include <QTableWidget> #include <QTableWidget>
#include <QLineEdit> #include <QLineEdit>
#include <vector>
class auto_pause_settings_dialog : public QDialog class auto_pause_settings_dialog : public QDialog
{ {

View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "stdafx.h"
#include "util/types.hpp"
#include <set> #include <set>
enum class breakpoint_types enum class breakpoint_types

View file

@ -1,8 +1,9 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QListWidget> #include <QListWidget>
#include <memory>
class CPUDisAsm; class CPUDisAsm;
class cpu_thread; class cpu_thread;

View file

@ -1,5 +1,7 @@
#include "call_stack_list.h" #include "call_stack_list.h"
#include "Utilities/StrFmt.h"
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;
call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent) call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent)

View file

@ -1,11 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/CPU/CPUThread.h"
#include "Emu/CPU/CPUDisAsm.h"
#include <QListWidget> #include <QListWidget>
#include <memory>
#include <vector>
class cpu_thread;
class CPUDisAsm;
class call_stack_list : public QListWidget class call_stack_list : public QListWidget
{ {

View file

@ -1,5 +1,3 @@
#include "stdafx.h"
#include "cg_disasm_window.h" #include "cg_disasm_window.h"
#include "gui_settings.h" #include "gui_settings.h"
#include "syntax_highlighter.h" #include "syntax_highlighter.h"

View file

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "util/types.hpp"
#include <QTextEdit> #include <QTextEdit>
#include <QDropEvent> #include <QDropEvent>
#include <memory>
#include "stdafx.h"
class AsmHighlighter; class AsmHighlighter;
class GlslHighlighter; class GlslHighlighter;

View file

@ -20,6 +20,7 @@
#include "util/yaml.hpp" #include "util/yaml.hpp"
#include "util/asm.hpp" #include "util/asm.hpp"
#include "util/to_endian.hpp" #include "util/to_endian.hpp"
#include "Utilities/File.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/bin_patch.h" // get_patches_path() #include "Utilities/bin_patch.h" // get_patches_path()

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QTableWidget> #include <QTableWidget>
#include <QListWidget> #include <QListWidget>
@ -8,6 +9,10 @@
#include <QComboBox> #include <QComboBox>
#include <QPushButton> #include <QPushButton>
#include <string>
#include <vector>
#include <map>
#include "Utilities/cheat_info.h" #include "Utilities/cheat_info.h"
class cheat_engine class cheat_engine

View file

@ -1,4 +1,3 @@
#include "stdafx.h"
#include "curl_handle.h" #include "curl_handle.h"
#include "Emu/System.h" #include "Emu/System.h"

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "custom_dock_widget.h" #include "custom_dock_widget.h"
@ -9,6 +9,9 @@
#include <QPushButton> #include <QPushButton>
#include <QComboBox> #include <QComboBox>
#include <memory>
#include <vector>
class CPUDisAsm; class CPUDisAsm;
class cpu_thread; class cpu_thread;
class gui_settings; class gui_settings;

View file

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QListWidget> #include <QListWidget>
#include <memory>
class breakpoint_handler; class breakpoint_handler;
class CPUDisAsm; class CPUDisAsm;
class cpu_thread; class cpu_thread;

View file

@ -1,5 +1,3 @@
#include "stdafx.h"
#include <QApplication> #include <QApplication>
#include <QThread> #include <QThread>
@ -8,6 +6,7 @@
#include "progress_dialog.h" #include "progress_dialog.h"
#include "Crypto/sha256.h" #include "Crypto/sha256.h"
#include "util/logs.hpp"
LOG_CHANNEL(network_log, "NETWORK"); LOG_CHANNEL(network_log, "NETWORK");

View file

@ -11,6 +11,7 @@
#include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/Cell/Modules/cellSysutil.h"
#include "util/yaml.hpp" #include "util/yaml.hpp"
#include "Utilities/File.h"
LOG_CHANNEL(cfg_log, "CFG"); LOG_CHANNEL(cfg_log, "CFG");

View file

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "yaml-cpp/yaml.h" #include "util/types.hpp"
#include "stdafx.h" #include "yaml-cpp/yaml.h"
#include "microphone_creator.h" #include "microphone_creator.h"
#include "render_creator.h" #include "render_creator.h"
@ -15,6 +15,9 @@
#include <QSpinBox> #include <QSpinBox>
#include <QDateTimeEdit> #include <QDateTimeEdit>
#include <string>
#include <vector>
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;
class emu_settings : public QObject class emu_settings : public QObject

View file

@ -3,6 +3,8 @@
#include <QLayout> #include <QLayout>
#include <QTextDocument> #include <QTextDocument>
#include <string>
fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox() fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox()
{ {
setWindowTitle(tr("RPCS3: Fatal Error")); setWindowTitle(tr("RPCS3: Fatal Error"));

View file

@ -2,6 +2,8 @@
#include <QMessageBox> #include <QMessageBox>
#include <string>
class fatal_error_dialog : public QMessageBox class fatal_error_dialog : public QMessageBox
{ {
Q_OBJECT Q_OBJECT

View file

@ -19,6 +19,7 @@
#include "Loader/PSF.h" #include "Loader/PSF.h"
#include "util/types.hpp" #include "util/types.hpp"
#include "Utilities/lockless.h" #include "Utilities/lockless.h"
#include "Utilities/File.h"
#include "util/yaml.hpp" #include "util/yaml.hpp"
#include "Input/pad_thread.h" #include "Input/pad_thread.h"

View file

@ -1,4 +1,3 @@
#include "stdafx.h"
#include "gl_gs_frame.h" #include "gl_gs_frame.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"

View file

@ -1,8 +1,11 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "gs_frame.h" #include "gs_frame.h"
#include <memory>
struct GLContext struct GLContext
{ {
QSurface *surface = nullptr; QSurface *surface = nullptr;

View file

@ -4,6 +4,7 @@
#include "Utilities/Config.h" #include "Utilities/Config.h"
#include "Utilities/Timer.h" #include "Utilities/Timer.h"
#include "Utilities/date_time.h" #include "Utilities/date_time.h"
#include "Utilities/File.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "util/atomic.hpp"
#include "Emu/RSX/GSFrameBase.h" #include "Emu/RSX/GSFrameBase.h"
#include <QWindow> #include <QWindow>
@ -12,6 +13,9 @@
#include <QWinTaskbarButton> #include <QWinTaskbarButton>
#endif #endif
#include <memory>
#include <vector>
class gui_settings; class gui_settings;
class gs_frame : public QWindow, public GSFrameBase class gs_frame : public QWindow, public GSFrameBase

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QApplication> #include <QApplication>
#include <QElapsedTimer> #include <QElapsedTimer>
@ -9,6 +9,9 @@
#include "main_application.h" #include "main_application.h"
#include <memory>
#include <functional>
class gs_frame; class gs_frame;
class main_window; class main_window;
class gui_settings; class gui_settings;

View file

@ -1,11 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QLineEdit> #include <QLineEdit>
#include <QLabel> #include <QLabel>
#include <memory>
class CPUDisAsm; class CPUDisAsm;
class cpu_thread; class cpu_thread;

View file

@ -1,5 +1,3 @@
#include "stdafx.h"
#include <map> #include <map>
#include <QVBoxLayout> #include <QVBoxLayout>

View file

@ -2,7 +2,6 @@
#include "qt_utils.h" #include "qt_utils.h"
#include "gui_settings.h" #include "gui_settings.h"
#include "stdafx.h"
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include "Utilities/lockless.h" #include "Utilities/lockless.h"

View file

@ -1,5 +1,3 @@
#include "stdafx.h"
#include "main_window.h" #include "main_window.h"
#include "qt_utils.h" #include "qt_utils.h"
#include "vfs_dialog.h" #include "vfs_dialog.h"

View file

@ -1,4 +1,3 @@
#include "stdafx.h"
#include "memory_string_searcher.h" #include "memory_string_searcher.h"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
@ -6,6 +5,8 @@
#include <QPushButton> #include <QPushButton>
#include <QHBoxLayout> #include <QHBoxLayout>
#include "util/logs.hpp"
LOG_CHANNEL(gui_log, "GUI"); LOG_CHANNEL(gui_log, "GUI");
memory_string_searcher::memory_string_searcher(QWidget* parent) memory_string_searcher::memory_string_searcher(QWidget* parent)

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QLineEdit> #include <QLineEdit>
@ -8,6 +8,8 @@
#include <QFont> #include <QFont>
#include <QFontDatabase> #include <QFontDatabase>
#include <string>
class memory_viewer_panel : public QDialog class memory_viewer_panel : public QDialog
{ {
Q_OBJECT Q_OBJECT

View file

@ -1,5 +1,6 @@
#include "microphone_creator.h" #include "microphone_creator.h"
#include "Utilities/StrFmt.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "3rdparty/OpenAL/include/alext.h" #include "3rdparty/OpenAL/include/alext.h"

View file

@ -1,12 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QObject> #include <QObject>
#include <array> #include <array>
#include <string>
class microphone_creator : public QObject class microphone_creator : public QObject
{ {

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Cell/Modules/cellMsgDialog.h" #include "Emu/Cell/Modules/cellMsgDialog.h"
#include <QProgressBar> #include <QProgressBar>
@ -11,6 +11,8 @@
#include <QWinTaskbarButton> #include <QWinTaskbarButton>
#endif #endif
#include <string>
class custom_dialog; class custom_dialog;
class msg_dialog_frame : public QObject, public MsgDialogBase class msg_dialog_frame : public QObject, public MsgDialogBase

View file

@ -1,10 +1,12 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Cell/Modules/cellOskDialog.h" #include "Emu/Cell/Modules/cellOskDialog.h"
#include <QObject> #include <QObject>
#include <string>
class custom_dialog; class custom_dialog;
class osk_dialog_frame : public QObject, public OskDialogBase class osk_dialog_frame : public QObject, public OskDialogBase

View file

@ -1,6 +1,7 @@
#include "stdafx.h"
#include "persistent_settings.h" #include "persistent_settings.h"
#include "util/logs.hpp"
LOG_CHANNEL(cfg_log, "CFG"); LOG_CHANNEL(cfg_log, "CFG");
persistent_settings::persistent_settings(QObject* parent) : settings(parent) persistent_settings::persistent_settings(QObject* parent) : settings(parent)

View file

@ -9,6 +9,7 @@
#include <QUrl> #include <QUrl>
#include "Emu/System.h" #include "Emu/System.h"
#include "Utilities/File.h"
inline std::string sstr(const QString& _in) { return _in.toStdString(); } inline std::string sstr(const QString& _in) { return _in.toStdString(); }
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDir> #include <QDir>
#include <QComboBox> #include <QComboBox>
#include <QFont> #include <QFont>
@ -10,6 +11,8 @@
#include <QHeaderView> #include <QHeaderView>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <string>
namespace gui namespace gui
{ {
namespace utils namespace utils

View file

@ -1,11 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QComboBox> #include <QComboBox>
#include <QLineEdit> #include <QLineEdit>
#include <memory>
class CPUDisAsm; class CPUDisAsm;
class cpu_thread; class cpu_thread;

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QGroupBox> #include <QGroupBox>
@ -12,6 +12,8 @@
#include <QTableWidget> #include <QTableWidget>
#include <QTabWidget> #include <QTabWidget>
#include <memory>
class gui_settings; class gui_settings;
class Buffer : public QGroupBox class Buffer : public QGroupBox

View file

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/Cell/Modules/cellSaveData.h" #include "Emu/Cell/Modules/cellSaveData.h"
#include "util/types.hpp"
class save_data_dialog : public SaveDialogBase class save_data_dialog : public SaveDialogBase
{ {
public: public:

View file

@ -1,4 +1,3 @@
#include "stdafx.h"
#include "save_data_info_dialog.h" #include "save_data_info_dialog.h"
#include <QPushButton> #include <QPushButton>

View file

@ -1,4 +1,3 @@
#include "stdafx.h"
#include "save_data_list_dialog.h" #include "save_data_list_dialog.h"
#include "save_data_info_dialog.h" #include "save_data_info_dialog.h"
#include "gui_settings.h" #include "gui_settings.h"

View file

@ -1,7 +1,6 @@
#pragma once #pragma once
// I just want the struct for the save data. #include "util/types.hpp"
#include "stdafx.h"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/Cell/Modules/cellSaveData.h" #include "Emu/Cell/Modules/cellSaveData.h"
@ -9,6 +8,9 @@
#include <QDialog> #include <QDialog>
#include <QLabel> #include <QLabel>
#include <vector>
#include <memory>
class gui_settings; class gui_settings;
class persistent_settings; class persistent_settings;

View file

@ -21,6 +21,8 @@
#include <QPainter> #include <QPainter>
#include <QScreen> #include <QScreen>
#include "Utilities/File.h"
LOG_CHANNEL(gui_log, "GUI"); LOG_CHANNEL(gui_log, "GUI");
namespace namespace

View file

@ -2,6 +2,8 @@
#include "qt_utils.h" #include "qt_utils.h"
#include "Utilities/File.h"
inline std::string sstr(const QString& _in) { return _in.toStdString(); } inline std::string sstr(const QString& _in) { return _in.toStdString(); }
settings::settings(QObject* parent) : QObject(parent), settings::settings(QObject* parent) : QObject(parent),

View file

@ -22,7 +22,6 @@
#include "render_creator.h" #include "render_creator.h"
#include "microphone_creator.h" #include "microphone_creator.h"
#include "stdafx.h"
#include "Emu/GameInfo.h" #include "Emu/GameInfo.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QDialog> #include <QDialog>
#include <QPushButton> #include <QPushButton>

View file

@ -5,10 +5,9 @@
#include "game_list.h" #include "game_list.h"
#include "gui_settings.h" #include "gui_settings.h"
#include "stdafx.h"
#include "util/logs.hpp" #include "util/logs.hpp"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/File.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/Modules/sceNpTrophy.h" #include "Emu/Cell/Modules/sceNpTrophy.h"

View file

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "Emu/Cell/Modules/sceNpTrophy.h" #include "Emu/Cell/Modules/sceNpTrophy.h"
#include <QWindow> #include <QWindow>
#include <vector>
class trophy_notification_helper : public TrophyNotificationBase class trophy_notification_helper : public TrophyNotificationBase
{ {

View file

@ -1,11 +1,12 @@
#include "stdafx.h"
#include "update_manager.h" #include "update_manager.h"
#include "progress_dialog.h" #include "progress_dialog.h"
#include "localized.h" #include "localized.h"
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include "downloader.h" #include "downloader.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/File.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "util/logs.hpp"
#include <QApplication> #include <QApplication>
#include <QDateTime> #include <QDateTime>
@ -15,7 +16,9 @@
#include <QThread> #include <QThread>
#if defined(_WIN32) #if defined(_WIN32)
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <windows.h> #include <windows.h>
#include <CpuArch.h> #include <CpuArch.h>
#include <7z.h> #include <7z.h>

View file

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <string>
class downloader; class downloader;
class update_manager final : public QObject class update_manager final : public QObject

View file

@ -1,10 +1,13 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "user_account.h" #include "user_account.h"
#include <QDialog> #include <QDialog>
#include <QTableWidget> #include <QTableWidget>
#include <string>
#include <memory>
#include <map>
class gui_settings; class gui_settings;
class persistent_settings; class persistent_settings;

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "util/types.hpp"
#include "gui_settings.h" #include "gui_settings.h"
#include "emu_settings.h" #include "emu_settings.h"
@ -9,6 +9,8 @@
#include <QListWidget> #include <QListWidget>
#include <QLabel> #include <QLabel>
#include <memory>
namespace cfg namespace cfg
{ {
class string; class string;

View file

@ -1,5 +1,4 @@
// No BOM and only basic ASCII in this file, or a neko will die #include "stdafx.h" // No BOM and only basic ASCII in this file, or a neko will die
#include "stdafx.h"
static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big); static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big);

View file

@ -1,7 +1,5 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#define NOMINMAX
#include "util/types.hpp" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/endian.hpp" #include "util/endian.hpp"

View file

@ -14,7 +14,9 @@
using namespace std::literals::chrono_literals; using namespace std::literals::chrono_literals;
#ifdef _WIN32 #ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#else #else
#include <sys/mman.h> #include <sys/mman.h>

View file

@ -13,7 +13,7 @@
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Lib> </Lib>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>