From b7bf316c1a146d225aace4af2efb9901b84c0422 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 22 Dec 2020 11:42:57 +0300 Subject: [PATCH] Don't randomly include "stdafx.h" It's file for precompiled headers. Include what is used, don't rely on transitive includes. --- Utilities/cheat_info.h | 4 +++- Utilities/sync.h | 2 ++ rpcs3/Emu/Audio/AudioBackend.h | 1 + rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp | 1 + rpcs3/Emu/Cell/Modules/cellMsgDialog.h | 5 +++++ rpcs3/Emu/Cell/Modules/cellOskDialog.h | 4 ++++ rpcs3/Emu/Cell/Modules/cellSaveData.h | 7 +++++-- rpcs3/Emu/Cell/Modules/sceNpTrophy.h | 4 +++- rpcs3/Emu/Cell/PPUThread.h | 1 + rpcs3/Emu/Cell/SPUThread.h | 1 + rpcs3/Emu/Io/MouseHandler.h | 1 + rpcs3/Emu/Io/interception.h | 3 +++ rpcs3/Emu/Io/pad_types.h | 4 ++++ rpcs3/Emu/Memory/vm.h | 1 + rpcs3/Emu/RSX/CgBinaryProgram.h | 3 ++- rpcs3/Emu/RSX/GL/GLHelpers.h | 1 + rpcs3/Emu/RSX/GL/GLOverlays.h | 3 ++- rpcs3/Emu/RSX/GL/GLTextOut.h | 4 +++- rpcs3/Emu/RSX/GL/GLTextureCache.h | 5 ++++- rpcs3/Emu/RSX/GSFrameBase.h | 3 +++ rpcs3/Emu/RSX/Overlays/overlay_controls.h | 1 + rpcs3/Emu/RSX/VK/VKHelpers.h | 2 +- rpcs3/Emu/RSX/VK/VKRenderTargets.h | 2 +- rpcs3/Emu/RSX/VK/VKTextureCache.h | 6 +++++- rpcs3/Emu/System.h | 4 +++- rpcs3/Input/basic_keyboard_handler.h | 2 +- rpcs3/Input/basic_mouse_handler.cpp | 3 +++ rpcs3/Input/basic_mouse_handler.h | 2 +- rpcs3/Input/evdev_joystick_handler.h | 4 +++- rpcs3/Input/keyboard_pad_handler.h | 5 ++++- rpcs3/Input/mm_joystick_handler.h | 10 +++++++++- rpcs3/Input/pad_thread.h | 11 +++++++---- rpcs3/Input/xinput_pad_handler.h | 2 ++ rpcs3/Loader/PSF.h | 7 +++++++ rpcs3/cmake_modules/ConfigureCompiler.cmake | 2 +- rpcs3/headless_application.h | 4 ++-- rpcs3/main.cpp | 1 + rpcs3/main_application.cpp | 4 ++++ rpcs3/rpcs3qt/_discord_utils.cpp | 6 ++++-- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp | 3 +++ rpcs3/rpcs3qt/auto_pause_settings_dialog.h | 3 ++- rpcs3/rpcs3qt/breakpoint_handler.h | 5 +++-- rpcs3/rpcs3qt/breakpoint_list.h | 3 ++- rpcs3/rpcs3qt/call_stack_list.cpp | 2 ++ rpcs3/rpcs3qt/call_stack_list.h | 10 ++++++---- rpcs3/rpcs3qt/cg_disasm_window.cpp | 2 -- rpcs3/rpcs3qt/cg_disasm_window.h | 5 +++-- rpcs3/rpcs3qt/cheat_manager.cpp | 1 + rpcs3/rpcs3qt/cheat_manager.h | 7 ++++++- rpcs3/rpcs3qt/curl_handle.cpp | 1 - rpcs3/rpcs3qt/debugger_frame.h | 7 +++++-- rpcs3/rpcs3qt/debugger_list.h | 4 +++- rpcs3/rpcs3qt/downloader.cpp | 3 +-- rpcs3/rpcs3qt/emu_settings.cpp | 1 + rpcs3/rpcs3qt/emu_settings.h | 7 +++++-- rpcs3/rpcs3qt/fatal_error_dialog.cpp | 2 ++ rpcs3/rpcs3qt/fatal_error_dialog.h | 2 ++ rpcs3/rpcs3qt/game_list_frame.cpp | 1 + rpcs3/rpcs3qt/gl_gs_frame.cpp | 1 - rpcs3/rpcs3qt/gl_gs_frame.h | 5 ++++- rpcs3/rpcs3qt/gs_frame.cpp | 1 + rpcs3/rpcs3qt/gs_frame.h | 6 +++++- rpcs3/rpcs3qt/gui_application.h | 5 ++++- rpcs3/rpcs3qt/instruction_editor_dialog.h | 4 +++- rpcs3/rpcs3qt/kernel_explorer.cpp | 2 -- rpcs3/rpcs3qt/log_frame.cpp | 1 - rpcs3/rpcs3qt/main_window.cpp | 2 -- rpcs3/rpcs3qt/memory_string_searcher.cpp | 3 ++- rpcs3/rpcs3qt/memory_viewer_panel.h | 4 +++- rpcs3/rpcs3qt/microphone_creator.cpp | 1 + rpcs3/rpcs3qt/microphone_creator.h | 3 ++- rpcs3/rpcs3qt/msg_dialog_frame.h | 4 +++- rpcs3/rpcs3qt/osk_dialog_frame.h | 4 +++- rpcs3/rpcs3qt/persistent_settings.cpp | 3 ++- rpcs3/rpcs3qt/qt_utils.cpp | 1 + rpcs3/rpcs3qt/qt_utils.h | 5 ++++- rpcs3/rpcs3qt/register_editor_dialog.h | 4 +++- rpcs3/rpcs3qt/rsx_debugger.h | 4 +++- rpcs3/rpcs3qt/save_data_dialog.h | 4 +++- rpcs3/rpcs3qt/save_data_info_dialog.cpp | 1 - rpcs3/rpcs3qt/save_data_list_dialog.cpp | 1 - rpcs3/rpcs3qt/save_data_list_dialog.h | 6 ++++-- rpcs3/rpcs3qt/save_manager_dialog.cpp | 2 ++ rpcs3/rpcs3qt/settings.cpp | 2 ++ rpcs3/rpcs3qt/settings_dialog.cpp | 1 - rpcs3/rpcs3qt/skylander_dialog.h | 2 +- rpcs3/rpcs3qt/trophy_manager_dialog.cpp | 3 +-- rpcs3/rpcs3qt/trophy_notification_helper.h | 3 ++- rpcs3/rpcs3qt/update_manager.cpp | 5 ++++- rpcs3/rpcs3qt/update_manager.h | 4 +++- rpcs3/rpcs3qt/user_manager_dialog.h | 5 ++++- rpcs3/rpcs3qt/vfs_dialog_tab.h | 4 +++- rpcs3/stdafx.cpp | 3 +-- rpcs3/stdafx.h | 2 -- rpcs3/util/logs.cpp | 2 ++ rpcs3_default.props | 2 +- 96 files changed, 235 insertions(+), 85 deletions(-) diff --git a/Utilities/cheat_info.h b/Utilities/cheat_info.h index c6b747ac7..101289ab9 100644 --- a/Utilities/cheat_info.h +++ b/Utilities/cheat_info.h @@ -1,6 +1,8 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" + +#include enum class cheat_type : u8 { diff --git a/Utilities/sync.h b/Utilities/sync.h index 6c89f3cfe..8370369c0 100644 --- a/Utilities/sync.h +++ b/Utilities/sync.h @@ -7,7 +7,9 @@ #include "util/dyn_lib.hpp" #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #elif __linux__ diff --git a/rpcs3/Emu/Audio/AudioBackend.h b/rpcs3/Emu/Audio/AudioBackend.h index eed105462..c5b7aeff9 100644 --- a/rpcs3/Emu/Audio/AudioBackend.h +++ b/rpcs3/Emu/Audio/AudioBackend.h @@ -1,6 +1,7 @@ #pragma once #include "util/types.hpp" +#include "Utilities/StrFmt.h" enum : u32 { diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp index 599c6bd88..f39b3eac3 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp @@ -2,6 +2,7 @@ #error "XAudio2 can only be built on Windows." #endif +#include #include "util/logs.hpp" #include "Utilities/StrFmt.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h index 8c8828b92..6150d58a9 100644 --- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h +++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h @@ -1,9 +1,14 @@ #pragma once +#include "util/types.hpp" +#include "util/atomic.hpp" #include "Utilities/BitField.h" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" +#include +#include + enum { CELL_MSGDIALOG_PROGRESSBAR_STRING_SIZE = 64, diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/Emu/Cell/Modules/cellOskDialog.h index 7365709c7..7c1acad8d 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.h +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.h @@ -1,6 +1,10 @@ #pragma once +#include "util/types.hpp" +#include "util/atomic.hpp" #include "Emu/Memory/vm_ptr.h" +#include +#include // error codes enum CellOskDialogError : u32 diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h index 71e55d380..93938faad 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.h +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h @@ -1,7 +1,10 @@ #pragma once -#include "stdafx.h" -#include +#include "util/types.hpp" +#include "util/endian.hpp" +#include "Emu/Memory/vm_ptr.h" +#include +#include // Return codes enum CellSaveDataError : u32 diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h index c898b93c1..96b814036 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h @@ -1,8 +1,10 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" +#include "util/endian.hpp" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" +#include // Error codes enum SceNpTrophyError : u32 diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 99549b42d..12428fb77 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -4,6 +4,7 @@ #include "../Memory/vm_ptr.h" #include "Utilities/lockless.h" +#include "util/logs.hpp" #include "util/v128.hpp" LOG_CHANNEL(ppu_log, "PPU"); diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 784ce5c07..7f4d6143f 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -7,6 +7,7 @@ #include #include "util/v128.hpp" +#include "util/logs.hpp" #include "util/to_endian.hpp" LOG_CHANNEL(spu_log, "SPU"); diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/Emu/Io/MouseHandler.h index f51a858c1..dc312900c 100644 --- a/rpcs3/Emu/Io/MouseHandler.h +++ b/rpcs3/Emu/Io/MouseHandler.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "Utilities/mutex.h" #include "util/init_mutex.hpp" diff --git a/rpcs3/Emu/Io/interception.h b/rpcs3/Emu/Io/interception.h index d72f34b56..d1b211206 100644 --- a/rpcs3/Emu/Io/interception.h +++ b/rpcs3/Emu/Io/interception.h @@ -1,5 +1,8 @@ #pragma once +#include "util/types.hpp" +#include "util/atomic.hpp" + namespace input { extern atomic_t g_intercepted; diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/Emu/Io/pad_types.h index d9ab1a2fe..cbef1dc1f 100644 --- a/rpcs3/Emu/Io/pad_types.h +++ b/rpcs3/Emu/Io/pad_types.h @@ -1,5 +1,9 @@ #pragma once +#include "util/types.hpp" + +#include + enum SystemInfo { CELL_PAD_INFO_INTERCEPTED = 0x00000001 diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index 2c999e673..1ce075ac8 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -3,6 +3,7 @@ #include #include #include "util/types.hpp" +#include "util/atomic.hpp" #include "Utilities/StrFmt.h" #include "util/to_endian.hpp" diff --git a/rpcs3/Emu/RSX/CgBinaryProgram.h b/rpcs3/Emu/RSX/CgBinaryProgram.h index 4cd600329..52abbdd32 100644 --- a/rpcs3/Emu/RSX/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/CgBinaryProgram.h @@ -1,8 +1,9 @@ #pragma once -#include + #include "Emu/Memory/vm.h" #include "Emu/RSX/GL/GLVertexProgram.h" #include "Emu/RSX/GL/GLFragmentProgram.h" +#include "Utilities/File.h" using CGprofile = be_t; using CGbool = be_t; diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index 4e0bc1060..e84667d9d 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -15,6 +15,7 @@ #include "Emu/system_config.h" #include "Utilities/mutex.h" #include "Utilities/geometry.h" +#include "Utilities/File.h" #include "util/logs.hpp" #include "util/asm.hpp" diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h index 565625769..52b9f6052 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.h +++ b/rpcs3/Emu/RSX/GL/GLOverlays.h @@ -1,8 +1,9 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "GLHelpers.h" #include "../Overlays/overlays.h" +#include extern u64 get_system_time(); diff --git a/rpcs3/Emu/RSX/GL/GLTextOut.h b/rpcs3/Emu/RSX/GL/GLTextOut.h index 384f4f5a5..9c8a5021b 100644 --- a/rpcs3/Emu/RSX/GL/GLTextOut.h +++ b/rpcs3/Emu/RSX/GL/GLTextOut.h @@ -1,8 +1,10 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "GLHelpers.h" #include "../Common/TextGlyphs.h" +#include +#include namespace gl { diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index 199441fb7..9ed5c4eb1 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -1,10 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "GLRenderTargets.h" #include "../Common/texture_cache.h" +#include +#include + class GLGSRender; namespace gl diff --git a/rpcs3/Emu/RSX/GSFrameBase.h b/rpcs3/Emu/RSX/GSFrameBase.h index d2b3882b0..cc2d4ab2f 100644 --- a/rpcs3/Emu/RSX/GSFrameBase.h +++ b/rpcs3/Emu/RSX/GSFrameBase.h @@ -1,6 +1,9 @@ #pragma once +#include "util/types.hpp" +#include "util/atomic.hpp" #include +#include #include "display.h" diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 32ad246a7..02c8e1890 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -1,6 +1,7 @@ #pragma once #include "util/types.hpp" +#include "util/logs.hpp" #include "Utilities/geometry.h" #include "Utilities/File.h" #include "overlay_utils.h" diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 5e67772f0..84adf3bb1 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include #include diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 740cadefa..66ea449f7 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "VKHelpers.h" #include "VKFormats.h" #include "../Common/surface_store.h" diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index f4560688f..287e2ccdf 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -1,10 +1,14 @@ #pragma once -#include "stdafx.h" + +#include "util/types.hpp" #include "VKRenderTargets.h" #include "VKResourceManager.h" #include "VKDMA.h" #include "../Common/texture_cache.h" +#include +#include + extern u64 get_system_time(); namespace vk diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 33de6f011..6d391543a 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -1,9 +1,11 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" +#include "util/atomic.hpp" #include #include #include +#include u64 get_system_time(); u64 get_guest_system_time(); diff --git a/rpcs3/Input/basic_keyboard_handler.h b/rpcs3/Input/basic_keyboard_handler.h index f99f92e06..4e9410ac9 100644 --- a/rpcs3/Input/basic_keyboard_handler.h +++ b/rpcs3/Input/basic_keyboard_handler.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Io/KeyboardHandler.h" #include diff --git a/rpcs3/Input/basic_mouse_handler.cpp b/rpcs3/Input/basic_mouse_handler.cpp index 80b36f425..c640ee167 100644 --- a/rpcs3/Input/basic_mouse_handler.cpp +++ b/rpcs3/Input/basic_mouse_handler.cpp @@ -1,6 +1,9 @@ #include #include +#include "util/types.hpp" +#include "util/logs.hpp" + #include "basic_mouse_handler.h" #include "rpcs3qt/gs_frame.h" #include "Emu/Io/interception.h" diff --git a/rpcs3/Input/basic_mouse_handler.h b/rpcs3/Input/basic_mouse_handler.h index 0d1c71dd3..dafcc0ce9 100644 --- a/rpcs3/Input/basic_mouse_handler.h +++ b/rpcs3/Input/basic_mouse_handler.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Io/MouseHandler.h" #include diff --git a/rpcs3/Input/evdev_joystick_handler.h b/rpcs3/Input/evdev_joystick_handler.h index a772f112b..5e4aa77da 100644 --- a/rpcs3/Input/evdev_joystick_handler.h +++ b/rpcs3/Input/evdev_joystick_handler.h @@ -1,10 +1,12 @@ #pragma once #ifdef HAVE_LIBEVDEV -#include "stdafx.h" +#include "util/types.hpp" #include "Utilities/File.h" #include "Emu/Io/PadHandler.h" #include +#include +#include #include #include #include diff --git a/rpcs3/Input/keyboard_pad_handler.h b/rpcs3/Input/keyboard_pad_handler.h index 1b99e4eba..addfaebf0 100644 --- a/rpcs3/Input/keyboard_pad_handler.h +++ b/rpcs3/Input/keyboard_pad_handler.h @@ -1,10 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Io/PadHandler.h" #include #include +#include +#include +#include enum mouse { diff --git a/rpcs3/Input/mm_joystick_handler.h b/rpcs3/Input/mm_joystick_handler.h index 9a7adc8b9..54132d44e 100644 --- a/rpcs3/Input/mm_joystick_handler.h +++ b/rpcs3/Input/mm_joystick_handler.h @@ -1,10 +1,18 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Io/PadHandler.h" +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #include +#include +#include +#include +#include + class mm_joystick_handler final : public PadHandlerBase { // Unique names for the config files and our pad settings dialog diff --git a/rpcs3/Input/pad_thread.h b/rpcs3/Input/pad_thread.h index 43b197abe..f190649cd 100644 --- a/rpcs3/Input/pad_thread.h +++ b/rpcs3/Input/pad_thread.h @@ -1,12 +1,15 @@ #pragma once +#include "util/types.hpp" +#include "util/atomic.hpp" +#include "Emu/Io/pad_types.h" +#include "Emu/Io/pad_config_types.h" + #include #include #include - -#include "stdafx.h" -#include "Emu/Io/pad_types.h" -#include "Emu/Io/pad_config_types.h" +#include +#include class PadHandlerBase; diff --git a/rpcs3/Input/xinput_pad_handler.h b/rpcs3/Input/xinput_pad_handler.h index 3285543b0..686a4094d 100644 --- a/rpcs3/Input/xinput_pad_handler.h +++ b/rpcs3/Input/xinput_pad_handler.h @@ -1,7 +1,9 @@ #pragma once #include "Emu/Io/PadHandler.h" +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #include diff --git a/rpcs3/Loader/PSF.h b/rpcs3/Loader/PSF.h index de303f75d..e35390209 100644 --- a/rpcs3/Loader/PSF.h +++ b/rpcs3/Loader/PSF.h @@ -1,8 +1,15 @@ #pragma once +#include "util/types.hpp" #include +#include #include +namespace fs +{ + class file; +} + namespace psf { enum class format : u16 diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake index d7a927753..1da1f276b 100644 --- a/rpcs3/cmake_modules/ConfigureCompiler.cmake +++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake @@ -2,7 +2,7 @@ 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} /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} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED") diff --git a/rpcs3/headless_application.h b/rpcs3/headless_application.h index faeca9513..70b3069f2 100644 --- a/rpcs3/headless_application.h +++ b/rpcs3/headless_application.h @@ -1,11 +1,11 @@ #pragma once -#include "stdafx.h" - #include #include "main_application.h" +#include + /** Headless RPCS3 Application Class * The main point of this class is to do application initialization and initialize callbacks. */ diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index 9e35967c4..7693a2b7a 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -39,6 +39,7 @@ DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResoluti #include "Utilities/Config.h" #include "Utilities/Thread.h" +#include "Utilities/File.h" #include "rpcs3_version.h" #include "Emu/System.h" #include diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp index 3b821a674..35cf90a4a 100644 --- a/rpcs3/main_application.cpp +++ b/rpcs3/main_application.cpp @@ -1,5 +1,9 @@ #include "main_application.h" +#include "util/types.hpp" +#include "util/logs.hpp" +#include "util/atomic.hpp" + #include "Input/pad_thread.h" #include "Emu/System.h" #include "Emu/system_config.h" diff --git a/rpcs3/rpcs3qt/_discord_utils.cpp b/rpcs3/rpcs3qt/_discord_utils.cpp index 5bfc2a3fa..2337d12c5 100644 --- a/rpcs3/rpcs3qt/_discord_utils.cpp +++ b/rpcs3/rpcs3qt/_discord_utils.cpp @@ -1,9 +1,11 @@ #ifdef WITH_DISCORD_RPC -#include "stdafx.h" #include "_discord_utils.h" #include "discord_rpc.h" #include "discord_register.h" +#include +#include + namespace discord { void initialize(const std::string& application_id) @@ -27,7 +29,7 @@ namespace discord if (reset_timer) { - discordPresence.startTimestamp = time(0); + discordPresence.startTimestamp = std::time(0); } Discord_UpdatePresence(&discordPresence); diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index 07b72957f..bafa5f524 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -8,6 +8,9 @@ #include #include +#include "util/logs.hpp" +#include "Utilities/File.h" + LOG_CHANNEL(autopause_log, "AutoPause"); constexpr auto qstr = QString::fromStdString; diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.h b/rpcs3/rpcs3qt/auto_pause_settings_dialog.h index 8b88177b6..766e6b61f 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.h +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.h @@ -1,11 +1,12 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include #include #include +#include class auto_pause_settings_dialog : public QDialog { diff --git a/rpcs3/rpcs3qt/breakpoint_handler.h b/rpcs3/rpcs3qt/breakpoint_handler.h index 720934e62..e3e508f33 100644 --- a/rpcs3/rpcs3qt/breakpoint_handler.h +++ b/rpcs3/rpcs3qt/breakpoint_handler.h @@ -1,5 +1,6 @@ #pragma once -#include "stdafx.h" + +#include "util/types.hpp" #include enum class breakpoint_types @@ -38,6 +39,6 @@ public: private: // TODO : generalize to hold multiple games and handle flags.Probably do : std::map>. - // Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do? + // Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do? std::set m_breakpoints; //! Holds all breakpoints. }; diff --git a/rpcs3/rpcs3qt/breakpoint_list.h b/rpcs3/rpcs3qt/breakpoint_list.h index af6a76f17..ec3ac7887 100644 --- a/rpcs3/rpcs3qt/breakpoint_list.h +++ b/rpcs3/rpcs3qt/breakpoint_list.h @@ -1,8 +1,9 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include +#include class CPUDisAsm; class cpu_thread; diff --git a/rpcs3/rpcs3qt/call_stack_list.cpp b/rpcs3/rpcs3qt/call_stack_list.cpp index cce0f99c4..19b9f6c3f 100644 --- a/rpcs3/rpcs3qt/call_stack_list.cpp +++ b/rpcs3/rpcs3qt/call_stack_list.cpp @@ -1,5 +1,7 @@ #include "call_stack_list.h" +#include "Utilities/StrFmt.h" + constexpr auto qstr = QString::fromStdString; call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent) diff --git a/rpcs3/rpcs3qt/call_stack_list.h b/rpcs3/rpcs3qt/call_stack_list.h index 971626bf9..49454f32d 100644 --- a/rpcs3/rpcs3qt/call_stack_list.h +++ b/rpcs3/rpcs3qt/call_stack_list.h @@ -1,11 +1,13 @@ #pragma once -#include "stdafx.h" - -#include "Emu/CPU/CPUThread.h" -#include "Emu/CPU/CPUDisAsm.h" +#include "util/types.hpp" #include +#include +#include + +class cpu_thread; +class CPUDisAsm; class call_stack_list : public QListWidget { diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3qt/cg_disasm_window.cpp index 3acd5f3f0..e7175c84e 100644 --- a/rpcs3/rpcs3qt/cg_disasm_window.cpp +++ b/rpcs3/rpcs3qt/cg_disasm_window.cpp @@ -1,5 +1,3 @@ -#include "stdafx.h" - #include "cg_disasm_window.h" #include "gui_settings.h" #include "syntax_highlighter.h" diff --git a/rpcs3/rpcs3qt/cg_disasm_window.h b/rpcs3/rpcs3qt/cg_disasm_window.h index c6ab285ed..ae56d3fe1 100644 --- a/rpcs3/rpcs3qt/cg_disasm_window.h +++ b/rpcs3/rpcs3qt/cg_disasm_window.h @@ -1,9 +1,10 @@ #pragma once +#include "util/types.hpp" + #include #include - -#include "stdafx.h" +#include class AsmHighlighter; class GlslHighlighter; diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3qt/cheat_manager.cpp index ea7abd3c9..23baab830 100644 --- a/rpcs3/rpcs3qt/cheat_manager.cpp +++ b/rpcs3/rpcs3qt/cheat_manager.cpp @@ -20,6 +20,7 @@ #include "util/yaml.hpp" #include "util/asm.hpp" #include "util/to_endian.hpp" +#include "Utilities/File.h" #include "Utilities/StrUtil.h" #include "Utilities/bin_patch.h" // get_patches_path() diff --git a/rpcs3/rpcs3qt/cheat_manager.h b/rpcs3/rpcs3qt/cheat_manager.h index 8b981ae51..0a428399f 100644 --- a/rpcs3/rpcs3qt/cheat_manager.h +++ b/rpcs3/rpcs3qt/cheat_manager.h @@ -1,6 +1,7 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" + #include #include #include @@ -8,6 +9,10 @@ #include #include +#include +#include +#include + #include "Utilities/cheat_info.h" class cheat_engine diff --git a/rpcs3/rpcs3qt/curl_handle.cpp b/rpcs3/rpcs3qt/curl_handle.cpp index ae8ca82fc..4051fe9c7 100644 --- a/rpcs3/rpcs3qt/curl_handle.cpp +++ b/rpcs3/rpcs3qt/curl_handle.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "curl_handle.h" #include "Emu/System.h" diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h index 5f73d2e26..f91459a0b 100644 --- a/rpcs3/rpcs3qt/debugger_frame.h +++ b/rpcs3/rpcs3qt/debugger_frame.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "custom_dock_widget.h" @@ -9,6 +9,9 @@ #include #include +#include +#include + class CPUDisAsm; class cpu_thread; class gui_settings; @@ -73,7 +76,7 @@ public: void ClearCallStack(); /** Needed so key press events work when other objects are selected in debugger_frame. */ - bool eventFilter(QObject* object, QEvent* event) override; + bool eventFilter(QObject* object, QEvent* event) override; protected: /** Override inherited method from Qt to allow signalling when close happened.*/ void closeEvent(QCloseEvent* event) override; diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3qt/debugger_list.h index fdd4e7d62..e7d0469ad 100644 --- a/rpcs3/rpcs3qt/debugger_list.h +++ b/rpcs3/rpcs3qt/debugger_list.h @@ -1,9 +1,11 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include +#include + class breakpoint_handler; class CPUDisAsm; class cpu_thread; diff --git a/rpcs3/rpcs3qt/downloader.cpp b/rpcs3/rpcs3qt/downloader.cpp index 4270502ad..ee2d3042a 100644 --- a/rpcs3/rpcs3qt/downloader.cpp +++ b/rpcs3/rpcs3qt/downloader.cpp @@ -1,5 +1,3 @@ -#include "stdafx.h" - #include #include @@ -8,6 +6,7 @@ #include "progress_dialog.h" #include "Crypto/sha256.h" +#include "util/logs.hpp" LOG_CHANNEL(network_log, "NETWORK"); diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index fde037203..edefcc48c 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -11,6 +11,7 @@ #include "Emu/Cell/Modules/cellSysutil.h" #include "util/yaml.hpp" +#include "Utilities/File.h" LOG_CHANNEL(cfg_log, "CFG"); diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index dfcc7d6fe..8ca505009 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -1,8 +1,8 @@ #pragma once -#include "yaml-cpp/yaml.h" +#include "util/types.hpp" -#include "stdafx.h" +#include "yaml-cpp/yaml.h" #include "microphone_creator.h" #include "render_creator.h" @@ -15,6 +15,9 @@ #include #include +#include +#include + constexpr auto qstr = QString::fromStdString; class emu_settings : public QObject diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.cpp b/rpcs3/rpcs3qt/fatal_error_dialog.cpp index 7610df222..becf5cfae 100644 --- a/rpcs3/rpcs3qt/fatal_error_dialog.cpp +++ b/rpcs3/rpcs3qt/fatal_error_dialog.cpp @@ -3,6 +3,8 @@ #include #include +#include + fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox() { setWindowTitle(tr("RPCS3: Fatal Error")); diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.h b/rpcs3/rpcs3qt/fatal_error_dialog.h index 96c74aa80..15c5bbdc2 100644 --- a/rpcs3/rpcs3qt/fatal_error_dialog.h +++ b/rpcs3/rpcs3qt/fatal_error_dialog.h @@ -2,6 +2,8 @@ #include +#include + class fatal_error_dialog : public QMessageBox { Q_OBJECT diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 147277ebc..c35a2f979 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -19,6 +19,7 @@ #include "Loader/PSF.h" #include "util/types.hpp" #include "Utilities/lockless.h" +#include "Utilities/File.h" #include "util/yaml.hpp" #include "Input/pad_thread.h" diff --git a/rpcs3/rpcs3qt/gl_gs_frame.cpp b/rpcs3/rpcs3qt/gl_gs_frame.cpp index dabf8ae8d..77342a8d0 100644 --- a/rpcs3/rpcs3qt/gl_gs_frame.cpp +++ b/rpcs3/rpcs3qt/gl_gs_frame.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "gl_gs_frame.h" #include "Emu/system_config.h" diff --git a/rpcs3/rpcs3qt/gl_gs_frame.h b/rpcs3/rpcs3qt/gl_gs_frame.h index b02174032..505b8614c 100644 --- a/rpcs3/rpcs3qt/gl_gs_frame.h +++ b/rpcs3/rpcs3qt/gl_gs_frame.h @@ -1,8 +1,11 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" + #include "gs_frame.h" +#include + struct GLContext { QSurface *surface = nullptr; diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 8c356f846..784f147c1 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -4,6 +4,7 @@ #include "Utilities/Config.h" #include "Utilities/Timer.h" #include "Utilities/date_time.h" +#include "Utilities/File.h" #include "Emu/System.h" #include "Emu/system_config.h" #include "Emu/IdManager.h" diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h index b1cc91e46..9aff3cd3a 100644 --- a/rpcs3/rpcs3qt/gs_frame.h +++ b/rpcs3/rpcs3qt/gs_frame.h @@ -1,6 +1,7 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" +#include "util/atomic.hpp" #include "Emu/RSX/GSFrameBase.h" #include @@ -12,6 +13,9 @@ #include #endif +#include +#include + class gui_settings; class gs_frame : public QWindow, public GSFrameBase diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3qt/gui_application.h index b081b84be..c954c5a23 100644 --- a/rpcs3/rpcs3qt/gui_application.h +++ b/rpcs3/rpcs3qt/gui_application.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include @@ -9,6 +9,9 @@ #include "main_application.h" +#include +#include + class gs_frame; class main_window; class gui_settings; diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.h b/rpcs3/rpcs3qt/instruction_editor_dialog.h index 492a16dca..8917ba105 100644 --- a/rpcs3/rpcs3qt/instruction_editor_dialog.h +++ b/rpcs3/rpcs3qt/instruction_editor_dialog.h @@ -1,11 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include #include +#include + class CPUDisAsm; class cpu_thread; diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index 770544f57..750d9bab5 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -1,5 +1,3 @@ -#include "stdafx.h" - #include #include diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index f2df6fe27..e6199b9de 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -2,7 +2,6 @@ #include "qt_utils.h" #include "gui_settings.h" -#include "stdafx.h" #include "rpcs3_version.h" #include "Utilities/mutex.h" #include "Utilities/lockless.h" diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 09d2a0d13..d34748889 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1,5 +1,3 @@ -#include "stdafx.h" - #include "main_window.h" #include "qt_utils.h" #include "vfs_dialog.h" diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp index cad1b44a8..614ae77cb 100644 --- a/rpcs3/rpcs3qt/memory_string_searcher.cpp +++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "memory_string_searcher.h" #include "Emu/Memory/vm.h" @@ -6,6 +5,8 @@ #include #include +#include "util/logs.hpp" + LOG_CHANNEL(gui_log, "GUI"); memory_string_searcher::memory_string_searcher(QWidget* parent) diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.h b/rpcs3/rpcs3qt/memory_viewer_panel.h index da09f2fb6..f024ef7ff 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.h +++ b/rpcs3/rpcs3qt/memory_viewer_panel.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include @@ -8,6 +8,8 @@ #include #include +#include + class memory_viewer_panel : public QDialog { Q_OBJECT diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp index eb12cbb9e..0273a363e 100644 --- a/rpcs3/rpcs3qt/microphone_creator.cpp +++ b/rpcs3/rpcs3qt/microphone_creator.cpp @@ -1,5 +1,6 @@ #include "microphone_creator.h" +#include "Utilities/StrFmt.h" #include "Utilities/StrUtil.h" #include "3rdparty/OpenAL/include/alext.h" diff --git a/rpcs3/rpcs3qt/microphone_creator.h b/rpcs3/rpcs3qt/microphone_creator.h index 4dcdf31ee..0e8e1613f 100644 --- a/rpcs3/rpcs3qt/microphone_creator.h +++ b/rpcs3/rpcs3qt/microphone_creator.h @@ -1,12 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include #include #include +#include class microphone_creator : public QObject { diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.h b/rpcs3/rpcs3qt/msg_dialog_frame.h index e1d95c887..33e1cf568 100644 --- a/rpcs3/rpcs3qt/msg_dialog_frame.h +++ b/rpcs3/rpcs3qt/msg_dialog_frame.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Cell/Modules/cellMsgDialog.h" #include @@ -11,6 +11,8 @@ #include #endif +#include + class custom_dialog; class msg_dialog_frame : public QObject, public MsgDialogBase diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.h b/rpcs3/rpcs3qt/osk_dialog_frame.h index b0398880a..084f7ae3c 100644 --- a/rpcs3/rpcs3qt/osk_dialog_frame.h +++ b/rpcs3/rpcs3qt/osk_dialog_frame.h @@ -1,10 +1,12 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Cell/Modules/cellOskDialog.h" #include +#include + class custom_dialog; class osk_dialog_frame : public QObject, public OskDialogBase diff --git a/rpcs3/rpcs3qt/persistent_settings.cpp b/rpcs3/rpcs3qt/persistent_settings.cpp index 1d67e8229..b6c5b87ab 100644 --- a/rpcs3/rpcs3qt/persistent_settings.cpp +++ b/rpcs3/rpcs3qt/persistent_settings.cpp @@ -1,6 +1,7 @@ -#include "stdafx.h" #include "persistent_settings.h" +#include "util/logs.hpp" + LOG_CHANNEL(cfg_log, "CFG"); persistent_settings::persistent_settings(QObject* parent) : settings(parent) diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp index ed86173e8..8ac803a75 100644 --- a/rpcs3/rpcs3qt/qt_utils.cpp +++ b/rpcs3/rpcs3qt/qt_utils.cpp @@ -9,6 +9,7 @@ #include #include "Emu/System.h" +#include "Utilities/File.h" inline std::string sstr(const QString& _in) { return _in.toStdString(); } constexpr auto qstr = QString::fromStdString; diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h index e602590a1..f05d05eb0 100644 --- a/rpcs3/rpcs3qt/qt_utils.h +++ b/rpcs3/rpcs3qt/qt_utils.h @@ -1,6 +1,7 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" + #include #include #include @@ -10,6 +11,8 @@ #include #include +#include + namespace gui { namespace utils diff --git a/rpcs3/rpcs3qt/register_editor_dialog.h b/rpcs3/rpcs3qt/register_editor_dialog.h index 3388d4967..378c5c24d 100644 --- a/rpcs3/rpcs3qt/register_editor_dialog.h +++ b/rpcs3/rpcs3qt/register_editor_dialog.h @@ -1,11 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include #include +#include + class CPUDisAsm; class cpu_thread; diff --git a/rpcs3/rpcs3qt/rsx_debugger.h b/rpcs3/rpcs3qt/rsx_debugger.h index 4514e668e..d40528ba1 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.h +++ b/rpcs3/rpcs3qt/rsx_debugger.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include @@ -12,6 +12,8 @@ #include #include +#include + class gui_settings; class Buffer : public QGroupBox diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3qt/save_data_dialog.h index c0db209e1..e9c8c3c25 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.h +++ b/rpcs3/rpcs3qt/save_data_dialog.h @@ -1,9 +1,11 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Memory/vm.h" #include "Emu/Cell/Modules/cellSaveData.h" +#include "util/types.hpp" + class save_data_dialog : public SaveDialogBase { public: diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3qt/save_data_info_dialog.cpp index c056eaf36..851637eeb 100644 --- a/rpcs3/rpcs3qt/save_data_info_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_info_dialog.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "save_data_info_dialog.h" #include diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp index 8bfd168e3..6493f58d5 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "save_data_list_dialog.h" #include "save_data_info_dialog.h" #include "gui_settings.h" diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h index 8ff46ce5f..df15ddf75 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.h +++ b/rpcs3/rpcs3qt/save_data_list_dialog.h @@ -1,7 +1,6 @@ #pragma once -// I just want the struct for the save data. -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Memory/vm.h" #include "Emu/Cell/Modules/cellSaveData.h" @@ -9,6 +8,9 @@ #include #include +#include +#include + class gui_settings; class persistent_settings; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index a83f6fcd2..13a69b2fb 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -21,6 +21,8 @@ #include #include +#include "Utilities/File.h" + LOG_CHANNEL(gui_log, "GUI"); namespace diff --git a/rpcs3/rpcs3qt/settings.cpp b/rpcs3/rpcs3qt/settings.cpp index 234509243..b866bb86b 100644 --- a/rpcs3/rpcs3qt/settings.cpp +++ b/rpcs3/rpcs3qt/settings.cpp @@ -2,6 +2,8 @@ #include "qt_utils.h" +#include "Utilities/File.h" + inline std::string sstr(const QString& _in) { return _in.toStdString(); } settings::settings(QObject* parent) : QObject(parent), diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 9ec73cf9a..ee4799e02 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -22,7 +22,6 @@ #include "render_creator.h" #include "microphone_creator.h" -#include "stdafx.h" #include "Emu/GameInfo.h" #include "Emu/System.h" #include "Emu/system_config.h" diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h index 52d1ef2b4..8abb45947 100644 --- a/rpcs3/rpcs3qt/skylander_dialog.h +++ b/rpcs3/rpcs3qt/skylander_dialog.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp index 540addbaf..eff2c8576 100644 --- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp @@ -5,10 +5,9 @@ #include "game_list.h" #include "gui_settings.h" -#include "stdafx.h" - #include "util/logs.hpp" #include "Utilities/StrUtil.h" +#include "Utilities/File.h" #include "Emu/VFS.h" #include "Emu/System.h" #include "Emu/Cell/Modules/sceNpTrophy.h" diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.h b/rpcs3/rpcs3qt/trophy_notification_helper.h index 62e8eb9f0..c40613004 100644 --- a/rpcs3/rpcs3qt/trophy_notification_helper.h +++ b/rpcs3/rpcs3qt/trophy_notification_helper.h @@ -1,9 +1,10 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "Emu/Cell/Modules/sceNpTrophy.h" #include +#include class trophy_notification_helper : public TrophyNotificationBase { diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index 5db56e280..2de06a309 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -1,11 +1,12 @@ -#include "stdafx.h" #include "update_manager.h" #include "progress_dialog.h" #include "localized.h" #include "rpcs3_version.h" #include "downloader.h" #include "Utilities/StrUtil.h" +#include "Utilities/File.h" #include "Emu/System.h" +#include "util/logs.hpp" #include #include @@ -15,7 +16,9 @@ #include #if defined(_WIN32) +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #include <7z.h> diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3qt/update_manager.h index f034415f1..00b41c2ba 100644 --- a/rpcs3/rpcs3qt/update_manager.h +++ b/rpcs3/rpcs3qt/update_manager.h @@ -1,9 +1,11 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include #include +#include + class downloader; class update_manager final : public QObject diff --git a/rpcs3/rpcs3qt/user_manager_dialog.h b/rpcs3/rpcs3qt/user_manager_dialog.h index 522dad24f..b5cc60961 100644 --- a/rpcs3/rpcs3qt/user_manager_dialog.h +++ b/rpcs3/rpcs3qt/user_manager_dialog.h @@ -1,10 +1,13 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "user_account.h" #include #include +#include +#include +#include class gui_settings; class persistent_settings; diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h index 7fe178755..35d5b714d 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.h +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h @@ -1,6 +1,6 @@ #pragma once -#include "stdafx.h" +#include "util/types.hpp" #include "gui_settings.h" #include "emu_settings.h" @@ -9,6 +9,8 @@ #include #include +#include + namespace cfg { class string; diff --git a/rpcs3/stdafx.cpp b/rpcs3/stdafx.cpp index b23dfd488..c33f2e664 100644 --- a/rpcs3/stdafx.cpp +++ b/rpcs3/stdafx.cpp @@ -1,5 +1,4 @@ -// No BOM and only basic ASCII in this file, or a neko will die -#include "stdafx.h" +#include "stdafx.h" // No BOM and only basic ASCII in this file, or a neko will die static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big); diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index f62cabae2..d3894ba8f 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -1,7 +1,5 @@ #pragma once // No BOM and only basic ASCII in this header, or a neko will die -#define NOMINMAX - #include "util/types.hpp" #include "util/atomic.hpp" #include "util/endian.hpp" diff --git a/rpcs3/util/logs.cpp b/rpcs3/util/logs.cpp index 1c2a53063..d2361ed1f 100644 --- a/rpcs3/util/logs.cpp +++ b/rpcs3/util/logs.cpp @@ -14,7 +14,9 @@ using namespace std::literals::chrono_literals; #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #else #include diff --git a/rpcs3_default.props b/rpcs3_default.props index 508dde700..7074e50b8 100644 --- a/rpcs3_default.props +++ b/rpcs3_default.props @@ -13,7 +13,7 @@ true - PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + NOMINMAX;PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true Level3 false