diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 82b38bfe26..c086f911f4 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -118,8 +118,7 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "x86_64") elseif(NOT DEFINED ARCH_FLAG AND USE_CLANG_CL) set(ARCH_FLAG "-msse4.1") endif() - list(APPEND PCSX2_DEFS _ARCH_64=1 _M_X86=1) - set(_ARCH_64 1) + list(APPEND PCSX2_DEFS _M_X86=1) set(_M_X86 1) else() message(FATAL_ERROR "Unsupported architecture: ${PCSX2_TARGET_ARCHITECTURES}") @@ -136,7 +135,13 @@ option(USE_PGO_OPTIMIZE "Enable PGO optimization (use profile)") # Note1: Builtin strcmp/memcmp was proved to be slower on Mesa than stdlib version. # Note2: float operation SSE is impacted by the PCSX2 SSE configuration. In particular, flush to zero denormal. if(MSVC AND NOT USE_CLANG_CL) - add_compile_options("$<$:/Zc:externConstexpr>") + add_compile_options( + "$<$:/Zc:externConstexpr>" + "$<$:/Zc:__cplusplus>" + "$<$:/permissive->" + "/Zo" + "/utf-8" + ) elseif(NOT MSVC) add_compile_options(-pipe -fvisibility=hidden -pthread -fno-builtin-strcmp -fno-builtin-memcmp -mfpmath=sse) endif() diff --git a/common/common.vcxproj b/common/common.vcxproj index f341fe4a29..14d76822a2 100644 --- a/common/common.vcxproj +++ b/common/common.vcxproj @@ -22,7 +22,7 @@ - + @@ -37,17 +37,10 @@ %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\libpng %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\jpgd - Async + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\fmt\include Use PrecompiledHeader.h PrecompiledHeader.h - WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions) - _M_SSE=0x401;%(PreprocessorDefinitions) - _M_SSE=0x501;%(PreprocessorDefinitions) - NotSet - AdvancedVectorExtensions2 - -march=nehalem %(AdditionalOptions) - -march=haswell %(AdditionalOptions) $(IntDir)%(RelativeDir) @@ -180,9 +173,6 @@ - - {c0293b32-5acf-40f0-aa6c-e6da6f3bf33a} - {ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63} diff --git a/common/vsprops/3rdpartyDeps.props b/common/vsprops/3rdpartyDeps.props deleted file mode 100644 index 5364a9864b..0000000000 --- a/common/vsprops/3rdpartyDeps.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - <_ProjectFileVersion>10.0.30128.1 - <_PropertySheetDisplayName>Pcsx3rdpartyDependencies - - - - $(SolutionDir)3rdparty\;$(SolutionDir)3rdparty\soundtouch\soundtouch\;$(SolutionDir)3rdparty\rapidyaml\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src;$(SolutionDir)3rdparty\fmt\fmt\include\;$(SolutionDir)3rdparty\libchdr\libchdr\include;$(SolutionDir)3rdparty\wil\include;$(SolutionDir)3rdparty\Vulkan-Headers\include\;$(SolutionDir)3rdparty\include\;%(AdditionalIncludeDirectories) - WIL_SUPPRESS_EXCEPTIONS;%(PreprocessorDefinitions) - - - $(SolutionDir)deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - diff --git a/common/vsprops/BaseProperties.props b/common/vsprops/BaseProperties.props index 7c5bff811f..9c4aff3849 100644 --- a/common/vsprops/BaseProperties.props +++ b/common/vsprops/BaseProperties.props @@ -1,38 +1,7 @@  - <_ProjectFileVersion>10.0.30128.1 - <_PropertySheetDisplayName>PcsxBaseProperties - $(SolutionDir)bin\$(PcsxSubsection)\ + $(SolutionDir)bin\ $(PlatformName)\$(Configuration)\ - *.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) - - - true - $(SolutionDir);%(AdditionalIncludeDirectories) - __WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WINVER=0x0A00;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) - true - false - Level3 - ProgramDatabase - Default - 4063;4100;%(DisableSpecificWarnings) - stdcpp17 - - - - -flto=thin %(AdditionalOptions) - - - true - Windows - - - "$(SolutionDir)common\vsprops\preBuild.cmd" - - - $(SolutionDir);%(AdditionalIncludeDirectories) - - \ No newline at end of file diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props index 99651e5620..107d723b6c 100644 --- a/common/vsprops/CommonLibrary.props +++ b/common/vsprops/CommonLibrary.props @@ -1,22 +1,7 @@  - <_ProjectFileVersion>10.0.30128.1 $(SolutionDir)deps\$(PlatformName)\$(Configuration)\ $(PlatformName)\$(Configuration)\ - - - $(SolutionDir);$(SolutionDir)\3rdparty;%(AdditionalIncludeDirectories) - __WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - _ARCH_64=1;%(PreprocessorDefinitions) - true - false - Level3 - ProgramDatabase - Default - 4063;4100;%(DisableSpecificWarnings) - stdcpp17 - - \ No newline at end of file diff --git a/common/vsprops/GenerateSCMVersion.props b/common/vsprops/GenerateSCMVersion.props new file mode 100644 index 0000000000..6d2102aa86 --- /dev/null +++ b/common/vsprops/GenerateSCMVersion.props @@ -0,0 +1,9 @@ + + + + + + "$(SolutionDir)common\vsprops\preBuild.cmd" + + + \ No newline at end of file diff --git a/common/vsprops/common.props b/common/vsprops/common.props index c1ab16ed3a..e6afc06fb5 100644 --- a/common/vsprops/common.props +++ b/common/vsprops/common.props @@ -1,10 +1,6 @@  - $(ProjectDir)\..\.. - $(ProjectRootDir)\.. - $(SvnRootDir)\common - -avx2 @@ -17,42 +13,50 @@ $(ProjectName)$(ArchString)$(SSEString)$(ToolkitString)$(BuildString) - <_ProjectFileVersion>10.0.30128.1 false - ./;$(ProjectDir);$(ProjectDir)x86;$(ProjectDir)x86\ix86-32;$(ProjectDir)IPU;$(ProjectDir)System;%(AdditionalIncludeDirectories) - _M_X86;TIXML_USE_STL;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + $(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories) + __WIN32__;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) + PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions) + PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions) + NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions) + true false - $(IntDir)pcsx2.pch + Level3 + ProgramDatabase Default + 4063;4100;%(DisableSpecificWarnings) + stdcpp17 true - _ARCH_64=1;%(PreprocessorDefinitions) + Async + false + true + $(IntDir)%(RelativeDir) + + + + Precise + + + _M_X86;__SSE4_1__;%(PreprocessorDefinitions) + NotSet + AdvancedVectorExtensions2 + -march=nehalem %(AdditionalOptions) + -march=haswell %(AdditionalOptions) + %(AdditionalOptions) /Zc:externConstexpr /Zc:__cplusplus /Zo /utf-8 + + + + -flto=thin %(AdditionalOptions) - setupapi.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;%(AdditionalDependencies) - ..\;..\libs;%(AdditionalLibraryDirectories) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies) + dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;d3d12.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;OneCore.lib;%(AdditionalDependencies) true Windows - - - - - - - $(ProjectRootDir) - - - $(SvnRootDir) - - - $(SvnCommonDir) - - - $(PcsxSubsection) - - diff --git a/common/vsprops/plugin_svnroot.props b/common/vsprops/plugin_svnroot.props deleted file mode 100644 index 57bdc24741..0000000000 --- a/common/vsprops/plugin_svnroot.props +++ /dev/null @@ -1,32 +0,0 @@ - - - - plugins - $(ProjectDir).. - $(ProjectRootDir)\..\..\.. - $(SvnRootDir)\common - - - <_ProjectFileVersion>10.0.30128.1 - <_PropertySheetDisplayName>PluginSvnRoot - - - - $(ProjectDir);$(ProjectDir)\..\3rdparty;%(AdditionalIncludeDirectories) - - - - - $(PcsxSubsection) - - - $(ProjectRootDir) - - - $(SvnRootDir) - - - $(SvnCommonDir) - - - \ No newline at end of file diff --git a/pcsx2-gsrunner/Main.cpp b/pcsx2-gsrunner/Main.cpp index b084341b8b..b160f03696 100644 --- a/pcsx2-gsrunner/Main.cpp +++ b/pcsx2-gsrunner/Main.cpp @@ -37,24 +37,21 @@ #include "pcsx2/PrecompiledHeader.h" -#include "pcsx2/CDVD/CDVD.h" #include "pcsx2/CommonHost.h" -#include "pcsx2/Input/InputManager.h" -#include "pcsx2/ImGui/ImGuiManager.h" -#include "pcsx2/LogSink.h" +#include "pcsx2/Achievements.h" +#include "pcsx2/CDVD/CDVD.h" #include "pcsx2/GS.h" #include "pcsx2/GS/GS.h" #include "pcsx2/GSDumpReplayer.h" #include "pcsx2/Host.h" #include "pcsx2/INISettingsInterface.h" +#include "pcsx2/ImGui/ImGuiManager.h" +#include "pcsx2/Input/InputManager.h" +#include "pcsx2/LogSink.h" #include "pcsx2/PAD/Host/PAD.h" #include "pcsx2/PerformanceMetrics.h" #include "pcsx2/VMManager.h" -#ifdef ENABLE_ACHIEVEMENTS -#include "pcsx2/Achievements.h" -#endif - #include "svnrev.h" namespace GSRunner diff --git a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj index a8240a3718..dabae14731 100644 --- a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj +++ b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj @@ -21,7 +21,7 @@ - + @@ -34,72 +34,19 @@ - $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\freetype\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\simpleini\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories); - $(ProjectDir);$(SolutionDir)pcsx2;%(AdditionalIncludeDirectories) - - %(AdditionalIncludeDirectories);$(ProjectDir)\Settings;$(ProjectDir)\GameList - Async + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\fmt\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include; + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\simpleini\include + %(AdditionalIncludeDirectories);$(SolutionDir)pcsx2 NotUsing - NoExtensions - WIN32_LEAN_AND_MEAN;LZMA_API_STATIC;BUILD_DX=1;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_DISCORD_PRESENCE;ENABLE_OPENGL;ENABLE_VULKAN;DIRECTINPUT_VERSION=0x0800;PCSX2_CORE;%(PreprocessorDefinitions) - PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions) - PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions) - NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions) - _M_SSE=0x401;%(PreprocessorDefinitions) - _M_SSE=0x501;%(PreprocessorDefinitions) - NotSet - AdvancedVectorExtensions2 - -march=nehalem %(AdditionalOptions) - -march=haswell %(AdditionalOptions) - false - $(IntDir)%(RelativeDir) - - - Precise - true - true - /Zc:__cplusplus /Zo /utf-8%(AdditionalOptions) + WIN32_LEAN_AND_MEAN;LZMA_API_STATIC;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_DISCORD_PRESENCE;ENABLE_OPENGL;ENABLE_VULKAN;%(PreprocessorDefinitions) Console - Yes - comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies) - dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;d3d12.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;OneCore.lib;%(AdditionalDependencies) - - {449ad25e-424a-4714-babc-68706cdcc33b} - - - {bc236261-77e8-4567-8d09-45cd02965eb6} - - - {d6973076-9317-4ef2-a0b8-b7a18ac0713e} - - - {e9b51944-7e6d-4bcd-83f2-7bbd5a46182d} - - - {12728250-16ec-4dc6-94d7-e21dd88947f8} - - - {a0d2b3ad-1f72-4ee3-8b5c-f2c358da35f0} - - - {2f6c0388-20cb-4242-9f6c-a6ebb6a83f47} - false - - - {ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63} - {88fb34ec-845e-4f21-a552-f1573b9ed167} @@ -109,9 +56,6 @@ {6c7986c4-3e4d-4dcc-b3c6-6bb12b238995} - - {c0293b32-5acf-40f0-aa6c-e6da6f3bf33a} - diff --git a/pcsx2-qt/pcsx2-qt.vcxproj b/pcsx2-qt/pcsx2-qt.vcxproj index 2a7b33b5e8..50002d575c 100644 --- a/pcsx2-qt/pcsx2-qt.vcxproj +++ b/pcsx2-qt/pcsx2-qt.vcxproj @@ -21,7 +21,7 @@ - + @@ -35,51 +35,24 @@ - $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\freetype\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\baseclasses;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\simpleini\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\lzma\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\demangler\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories); - $(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include;%(AdditionalIncludeDirectories) - $(ProjectDir);$(SolutionDir)pcsx2;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\fmt\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\lzma\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\simpleini\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\demangler\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories); + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include + %(AdditionalIncludeDirectories);$(SolutionDir)pcsx2 %(AdditionalIncludeDirectories);$(ProjectDir)\Settings;$(ProjectDir)\GameList;$(ProjectDir)\Tools\InputRecording;$(ProjectDir)\Debugger;$(ProjectDir)\Debugger\Models - Async Use PrecompiledHeader.h - NoExtensions - WIN32_LEAN_AND_MEAN;LZMA_API_STATIC;BUILD_DX=1;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_DISCORD_PRESENCE;ENABLE_OPENGL;ENABLE_VULKAN;DIRECTINPUT_VERSION=0x0800;SDL_BUILD;%(PreprocessorDefinitions) - PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions) - PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions) - NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions) - - __SSE4_1__;%(PreprocessorDefinitions) - NotSet - AdvancedVectorExtensions2 - -march=nehalem %(AdditionalOptions) - -march=haswell %(AdditionalOptions) - false - $(IntDir)%(RelativeDir) - - - Precise - true - true + LZMA_API_STATIC;BUILD_DX=1;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_DISCORD_PRESENCE;ENABLE_OPENGL;ENABLE_VULKAN;SDL_BUILD;%(PreprocessorDefinitions) + true - /Zc:__cplusplus /Zo /utf-8%(AdditionalOptions) - Windows - Yes - comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies) - dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;d3d12.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;OneCore.lib;%(AdditionalDependencies) $(QtEntryPointLib);%(AdditionalDependencies) diff --git a/pcsx2/CDVD/CsoFileReader.cpp b/pcsx2/CDVD/CsoFileReader.cpp index 6d6b8e1980..dbd66d220b 100644 --- a/pcsx2/CDVD/CsoFileReader.cpp +++ b/pcsx2/CDVD/CsoFileReader.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs -* Copyright (C) 2002-2014 PCSX2 Dev Team +* Copyright (C) 2002-2023 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- @@ -14,16 +14,15 @@ */ #include "PrecompiledHeader.h" + #include "AsyncFileReader.h" #include "CsoFileReader.h" + #include "common/Pcsx2Types.h" #include "common/FileSystem.h" #include "common/StringUtil.h" -#ifdef __POSIX__ + #include -#else -#include -#endif // Implementation of CSO compressed ISO reading, based on: // https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md diff --git a/pcsx2/CDVD/GzippedFileReader.cpp b/pcsx2/CDVD/GzippedFileReader.cpp index d3c79624d9..29b62ff5e2 100644 --- a/pcsx2/CDVD/GzippedFileReader.cpp +++ b/pcsx2/CDVD/GzippedFileReader.cpp @@ -14,15 +14,18 @@ */ #include "PrecompiledHeader.h" -#include -#include "common/FileSystem.h" -#include "common/Path.h" -#include "common/StringUtil.h" + #include "Config.h" #include "ChunksCache.h" #include "GzippedFileReader.h" #include "Host.h" -#include "zlib_indexed.h" +#include "CDVD/zlib_indexed.h" + +#include "common/FileSystem.h" +#include "common/Path.h" +#include "common/StringUtil.h" + +#include #define CLAMP(val, minval, maxval) (std::min(maxval, std::max(minval, val))) diff --git a/pcsx2/CDVD/zlib_indexed.h b/pcsx2/CDVD/zlib_indexed.h index e53e8de86f..2d7a3fdc34 100644 --- a/pcsx2/CDVD/zlib_indexed.h +++ b/pcsx2/CDVD/zlib_indexed.h @@ -100,11 +100,7 @@ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 #include #include #include -#ifdef __POSIX__ #include -#else -#include -#endif #include "common/FileSystem.h" diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index fdd7e48a34..15bebe49a8 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -69,16 +69,12 @@ if(WIN32) set(MIN_WIN32 0x0A00) target_compile_definitions(PCSX2_FLAGS INTERFACE __SSE4_1__ - DIRECTINPUT_VERSION=0x0800 WINVER=${MIN_WIN32} _WIN32_WINNT=${MIN_WIN32} WIN32_LEAN_AND_MEAN LZMA_API_STATIC WIL_SUPPRESS_EXCEPTIONS ) - target_include_directories(PCSX2_FLAGS INTERFACE - ../3rdparty # GL headers - ) endif(WIN32) # Main pcsx2 source @@ -1227,12 +1223,10 @@ endif() # additonal include directories target_include_directories(PCSX2_FLAGS INTERFACE - . - x86 - ${CMAKE_BINARY_DIR}/pcsx2 - ${CMAKE_BINARY_DIR}/common/include/ - "${CMAKE_SOURCE_DIR}/3rdparty/jpgd/" - "${CMAKE_SOURCE_DIR}/3rdparty/xbyak/" + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_BINARY_DIR}/pcsx2" + "${CMAKE_BINARY_DIR}/common/include" + "${CMAKE_SOURCE_DIR}/3rdparty/xbyak" "${FFMPEG_INCLUDE_DIRS}" ) diff --git a/pcsx2/DEV9/ATA/ATA_Info.cpp b/pcsx2/DEV9/ATA/ATA_Info.cpp index 0d7c025041..7ed61149b4 100644 --- a/pcsx2/DEV9/ATA/ATA_Info.cpp +++ b/pcsx2/DEV9/ATA/ATA_Info.cpp @@ -99,7 +99,7 @@ void ATA::CreateHDDinfo(u64 sizeSectors) WriteUInt16(identifyData, &index, sectorSize); //word 5 //Default Number of sectors per track (Retired) WriteUInt16(identifyData, &index, defSectors); //word 6 - //Reserved for assignment by the CompactFlash™ Association + //Reserved for assignment by the CompactFlashâ„¢ Association index += 2 * 2; //word 7-8 //Retired index += 1 * 2; //word 9 @@ -182,7 +182,7 @@ void ATA::CreateHDDinfo(u64 sizeSectors) WriteUInt16(identifyData, &index, 0x1F); //word 64 (pio3,4 supported) selection not reported here //Minimum Multiword DMA transfer cycle time per word WriteUInt16(identifyData, &index, 80); //word 65 - //Manufacturer’s recommended Multiword DMA transfer cycle time + //Manufacturer’s recommended Multiword DMA transfer cycle time WriteUInt16(identifyData, &index, 80); //word 66 //Minimum PIO transfer cycle time without flow control WriteUInt16(identifyData, &index, 120); //word 67 @@ -307,7 +307,7 @@ void ATA::CreateHDDinfo(u64 sizeSectors) */ index = 93 * 2; WriteUInt16(identifyData, &index, (u16)(1 | (1 << 14) | 0x2000)); //word 93 - //Vendor’s recommended acoustic management value. + //Vendor’s recommended acoustic management value. //94 //Stream Minimum Request Size //95 diff --git a/pcsx2/DebugTools/ExpressionParser.cpp b/pcsx2/DebugTools/ExpressionParser.cpp index 82f7c9fd0b..517016d82e 100644 --- a/pcsx2/DebugTools/ExpressionParser.cpp +++ b/pcsx2/DebugTools/ExpressionParser.cpp @@ -468,7 +468,7 @@ bool parsePostfixExpression(PostfixExpression& exp, IExpressionFunctions* funcs, valueStack.push_back(val); } break; - case EXOP_SIGNPLUS: // keine aktion nötig + case EXOP_SIGNPLUS: // keine aktion nötig break; case EXOP_SIGNMINUS: // -0 if (useFloat) diff --git a/pcsx2/GS/GSExtra.h b/pcsx2/GS/GSExtra.h index 5ae6cad362..4678c21943 100644 --- a/pcsx2/GS/GSExtra.h +++ b/pcsx2/GS/GSExtra.h @@ -131,12 +131,6 @@ __fi static T VectorAlign(T value) // clang-format off -#ifdef __POSIX__ - #include -#else - #include -#endif - #ifdef _MSC_VER #define ALIGN_STACK(n) alignas(n) int dummy__; (void)dummy__; #else @@ -149,17 +143,3 @@ __fi static T VectorAlign(T value) #define ALIGN_STACK(n) alignas(n) int dummy__; #endif #endif - -#ifdef ENABLE_VTUNE - #include "jitprofiling.h" - #ifdef _WIN32 - #pragma comment(lib, "jitprofiling.lib") - #endif -#endif - -#ifdef _WIN32 - #define DIRECTORY_SEPARATOR '\\' -#else - #include // mkdir - #define DIRECTORY_SEPARATOR '/' -#endif diff --git a/pcsx2/Gif.cpp b/pcsx2/Gif.cpp index bf972abcdb..486c42cd0a 100644 --- a/pcsx2/Gif.cpp +++ b/pcsx2/Gif.cpp @@ -14,13 +14,12 @@ */ #include "PrecompiledHeader.h" -#include "Common.h" +#include "Common.h" #include "GS.h" #include "Gif_Unit.h" #include "Vif_Dma.h" - -#include "iR5900.h" +#include "x86/iR5900.h" // A three-way toggle used to determine if the GIF is stalling (transferring) or done (finished). // Should be a gifstate_t rather then int, but I don't feel like possibly interfering with savestates right now. diff --git a/pcsx2/Hw.cpp b/pcsx2/Hw.cpp index 5c9c59567d..aeb1460eab 100644 --- a/pcsx2/Hw.cpp +++ b/pcsx2/Hw.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -14,13 +14,13 @@ */ #include "PrecompiledHeader.h" -#include "Common.h" -#include "Hardware.h" -#include "newVif.h" +#include "Common.h" #include "Gif_Unit.h" +#include "Hardware.h" #include "SPU2/spu2.h" #include "USB/USB.h" +#include "x86/newVif.h" #include "fmt/core.h" diff --git a/pcsx2/IopBios.cpp b/pcsx2/IopBios.cpp index a5df6ecac7..a24c5e3bf5 100644 --- a/pcsx2/IopBios.cpp +++ b/pcsx2/IopBios.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2022 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,24 +13,25 @@ * If not, see . */ - #include "PrecompiledHeader.h" -#include "R3000A.h" + #include "Common.h" -#include "R5900.h" // for g_GameStarted +#include "DebugTools/SymbolMap.h" #include "IopBios.h" #include "IopMem.h" -#include "iR3000A.h" +#include "R3000A.h" +#include "R5900.h" #include "ps2/BiosTools.h" -#include "DebugTools/SymbolMap.h" +#include "x86/iR3000A.h" -#include -#include -#include -#include #include "common/FileSystem.h" #include "common/Path.h" +#include +#include +#include +#include + #include #ifdef _WIN32 diff --git a/pcsx2/IopHw.cpp b/pcsx2/IopHw.cpp index 88e9ecd063..b8f91658b2 100644 --- a/pcsx2/IopHw.cpp +++ b/pcsx2/IopHw.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,20 +13,18 @@ * If not, see . */ - #include "PrecompiledHeader.h" -#include "R3000A.h" + #include "Common.h" - -#include "iR5900.h" -#include "Sio.h" -#include "Mdec.h" -#include "IopCounters.h" -#include "IopHw.h" -#include "IopDma.h" -#include "CDVD/Ps1CD.h" #include "CDVD/CDVD.h" - +#include "CDVD/Ps1CD.h" +#include "IopCounters.h" +#include "IopDma.h" +#include "IopHw.h" +#include "Mdec.h" +#include "R3000A.h" +#include "Sio.h" +#include "x86/iR5900.h" // NOTE: Any modifications to read/write fns should also go into their const counterparts // found in iPsxHw.cpp. diff --git a/pcsx2/MTVU.cpp b/pcsx2/MTVU.cpp index 26ec5bf3be..c36751c6b8 100644 --- a/pcsx2/MTVU.cpp +++ b/pcsx2/MTVU.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -14,11 +14,12 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" -#include "MTVU.h" -#include "newVif.h" #include "Gif_Unit.h" -#include "common/Threading.h" +#include "MTVU.h" +#include "x86/newVif.h" + #include VU_Thread vu1Thread; diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index 07c4c88aae..930c386692 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -23,20 +23,20 @@ #include "PrecompiledHeader.h" +#include "DebugTools/Debug.h" +#include "R3000A.h" +#include "System.h" +#include "x86/iR5900.h" + +#include "fmt/core.h" + +#include +#include + #ifndef _WIN32 #include #endif -#include -#include - -#include "R3000A.h" -#include "iR5900.h" -#include "System.h" -#include "DebugTools/Debug.h" - -#include "fmt/core.h" - using namespace R5900; FILE* emuLog; diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index a207d97407..474241151a 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -14,27 +14,27 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" +#include "GS/Renderers/Common/GSFunctionMap.h" +#include "CDVD/CDVD.h" +#include "Elfheader.h" +#include "GSDumpReplayer.h" +#include "MTVU.h" #include "R3000A.h" #include "VUmicro.h" -#include "newVif.h" -#include "MTVU.h" - -#include "Elfheader.h" +#include "ps2/BiosTools.h" +#include "svnrev.h" +#include "x86/newVif.h" #include "common/Align.h" #include "common/MemsetFast.inl" #include "common/Perf.h" #include "common/StringUtil.h" -#include "CDVD/CDVD.h" -#include "ps2/BiosTools.h" -#include "GS/Renderers/Common/GSFunctionMap.h" +#ifdef _M_X86 #include "common/emitter/x86_intrin.h" - -#include "GSDumpReplayer.h" - -#include "svnrev.h" +#endif extern R5900cpu GSDumpReplayerCpu; diff --git a/pcsx2/USB/usb-eyetoy/cam-windows.cpp b/pcsx2/USB/usb-eyetoy/cam-windows.cpp index 06dcb2440f..8b4af6878f 100644 --- a/pcsx2/USB/usb-eyetoy/cam-windows.cpp +++ b/pcsx2/USB/usb-eyetoy/cam-windows.cpp @@ -17,7 +17,7 @@ #include "common/StringUtil.h" -#include +#include "jpge.h" #include "videodev.h" #include "cam-windows.h" #include "usb-eyetoy-webcam.h" @@ -175,6 +175,8 @@ namespace usb_eyetoy IMoniker* pMoniker = nullptr; while (pEnum->Next(1, &pMoniker, NULL) == S_OK && sourcefilter == nullptr) { + LONGLONG start = 0, stop = MAXLONGLONG; + IPropertyBag* pPropBag = nullptr; hr = pMoniker->BindToStorage(0, 0, IID_PPV_ARGS(&pPropBag)); if (FAILED(hr)) @@ -315,7 +317,6 @@ namespace usb_eyetoy } // if the stream is started, start capturing immediatly - LONGLONG start = 0, stop = MAXLONGLONG; hr = pGraphBuilder->ControlStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, sourcefilter, &start, &stop, 1, 2); if (FAILED(hr)) { diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index 0cf874a8be..6cdf7b4b48 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -37,6 +37,7 @@ #include "DEV9/DEV9.h" #include "USB/USB.h" #include "PAD/Host/PAD.h" +#include "PCSX2Base.h" #include "Sio.h" #include "ps2/BiosTools.h" #include "Recording/InputRecordingControls.h" diff --git a/pcsx2/Vif.cpp b/pcsx2/Vif.cpp index 00536be81e..06ba897849 100644 --- a/pcsx2/Vif.cpp +++ b/pcsx2/Vif.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -14,14 +14,15 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" -#include "Vif.h" -#include "Vif_Dma.h" -#include "newVif.h" #include "GS.h" #include "Gif.h" -#include "MTVU.h" #include "Gif_Unit.h" +#include "MTVU.h" +#include "Vif.h" +#include "Vif_Dma.h" +#include "x86/newVif.h" alignas(16) vifStruct vif0, vif1; diff --git a/pcsx2/Vif0_Dma.cpp b/pcsx2/Vif0_Dma.cpp index 412e52a5bd..4a52b4563e 100644 --- a/pcsx2/Vif0_Dma.cpp +++ b/pcsx2/Vif0_Dma.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "Vif_Dma.h" #include "VUmicro.h" -#include "newVif.h" +#include "x86/newVif.h" u32 g_vif0Cycles = 0; diff --git a/pcsx2/Vif1_Dma.cpp b/pcsx2/Vif1_Dma.cpp index ec45040308..f0364eaeb2 100644 --- a/pcsx2/Vif1_Dma.cpp +++ b/pcsx2/Vif1_Dma.cpp @@ -14,13 +14,14 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" -#include "Vif_Dma.h" #include "GS.h" #include "Gif_Unit.h" -#include "VUmicro.h" -#include "newVif.h" #include "MTVU.h" +#include "VUmicro.h" +#include "Vif_Dma.h" +#include "x86/newVif.h" u32 g_vif1Cycles = 0; diff --git a/pcsx2/Vif_Codes.cpp b/pcsx2/Vif_Codes.cpp index 508782590a..27a78e2024 100644 --- a/pcsx2/Vif_Codes.cpp +++ b/pcsx2/Vif_Codes.cpp @@ -14,13 +14,14 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" #include "GS.h" #include "Gif_Unit.h" -#include "Vif_Dma.h" -#include "newVif.h" -#include "VUmicro.h" #include "MTVU.h" +#include "VUmicro.h" +#include "Vif_Dma.h" +#include "x86/newVif.h" #define vifOp(vifCodeName) _vifT int vifCodeName(int pass, const u32* data) #define pass1 if (pass == 0) diff --git a/pcsx2/Vif_Transfer.cpp b/pcsx2/Vif_Transfer.cpp index dede156586..d81af63882 100644 --- a/pcsx2/Vif_Transfer.cpp +++ b/pcsx2/Vif_Transfer.cpp @@ -14,9 +14,10 @@ */ #include "PrecompiledHeader.h" + #include "Common.h" #include "Vif_Dma.h" -#include "newVif.h" +#include "x86/newVif.h" //------------------------------------------------------------------ // VifCode Transfer Interpreter (Vif0/Vif1) diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index 401a3060b4..de14441ea2 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -20,8 +20,8 @@ - - + + @@ -31,58 +31,43 @@ AllRules.ruleset pcsx2 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)3rdparty\xbyak;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\xz\xz\src\liblzma\api;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libpng;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\glad\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\glslang\glslang;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\cubeb\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\imgui\include;$(SolutionDir)3rdparty\imgui\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\simpleini\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\libzip;$(SolutionDir)3rdparty\libzip\libzip\lib;%(AdditionalIncludeDirectories) - $(SolutionDir)3rdparty\d3d12memalloc\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\fmt\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\wil\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\xz\xz\src\liblzma\api + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\zlib + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\libpng + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\libchdr\libchdr\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\cubeb\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\imgui\include;$(SolutionDir)3rdparty\imgui\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\simpleini\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\libzip;$(SolutionDir)3rdparty\libzip\libzip\lib %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\zstd\zstd\lib %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\cpuinfo\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\src + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rcheevos\rcheevos\include;$(SolutionDir)3rdparty\rainterface + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\soundtouch\soundtouch %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\discord-rpc\include - %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\zydis\include;$(SolutionDir)3rdparty\zydis\dependencies\zycore\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\jpgd %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\ffmpeg\include - Async + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\glad\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\glslang\glslang + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\vulkan-headers\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\d3d12memalloc\include + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\xbyak + %(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\zydis\include;$(SolutionDir)3rdparty\zydis\dependencies\zycore\include Use PrecompiledHeader.h PrecompiledHeader.h;%(ForcedIncludeFiles) - NoExtensions - /Zc:externConstexpr %(AdditionalOptions) - WIN32_LEAN_AND_MEAN;ZIP_STATIC;LZMA_API_STATIC;BUILD_DX=1;ENABLE_DISCORD_PRESENCE;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_OPENGL;ENABLE_VULKAN;SPU2X_CUBEB;SDL_BUILD;%(PreprocessorDefinitions) - PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions) - PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions) - NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions) - - __SSE4_1__;%(PreprocessorDefinitions) + ZIP_STATIC;LZMA_API_STATIC;ENABLE_DISCORD_PRESENCE;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_OPENGL;ENABLE_VULKAN;SPU2X_CUBEB;SDL_BUILD;%(PreprocessorDefinitions) ZYCORE_STATIC_DEFINE;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions) - NotSet - AdvancedVectorExtensions2 - -march=nehalem %(AdditionalOptions) - -march=haswell %(AdditionalOptions) - false - $(IntDir)%(RelativeDir) - - - Precise - - Yes - comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;iphlpapi.lib;dsound.lib;%(AdditionalDependencies) - dxguid.lib;dinput8.lib;hid.lib;PowrProf.lib;d3dcompiler.lib;d3d11.lib;dxgi.lib;strmiids.lib;opengl32.lib;comsuppw.lib;OneCore.lib;%(AdditionalDependencies) - @@ -848,7 +833,6 @@ {2f6c0388-20cb-4242-9f6c-a6ebb6a83f47} - false {ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63} diff --git a/pcsx2/x86/ix86-32/iCore-32.cpp b/pcsx2/x86/ix86-32/iCore-32.cpp index e5fc702292..0f267eeeba 100644 --- a/pcsx2/x86/ix86-32/iCore-32.cpp +++ b/pcsx2/x86/ix86-32/iCore-32.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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,13 +15,14 @@ #include "PrecompiledHeader.h" -#include "System.h" -#include "iR5900.h" -#include "Vif.h" -#include "VU.h" -#include "common/emitter/x86emitter.h" #include "R3000A.h" +#include "System.h" +#include "VU.h" +#include "Vif.h" #include "x86/iR3000A.h" +#include "x86/iR5900.h" + +#include "common/emitter/x86emitter.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 97b50c840c..24889dd75a 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -16,23 +16,20 @@ #include "PrecompiledHeader.h" #include "Common.h" +#include "CDVD/CDVD.h" +#include "DebugTools/Breakpoints.h" +#include "Elfheader.h" +#include "GS.h" #include "Memory.h" +#include "Patch.h" #include "R3000A.h" - #include "R5900OpcodeTables.h" -#include "iR5900.h" -#include "iR5900Analysis.h" -#include "BaseblockEx.h" +#include "VMManager.h" #include "VirtualMemory.h" #include "vtlb.h" - -#include "VMManager.h" -#include "GS.h" -#include "CDVD/CDVD.h" -#include "Elfheader.h" - -#include "DebugTools/Breakpoints.h" -#include "Patch.h" +#include "x86/BaseblockEx.h" +#include "x86/iR5900.h" +#include "x86/iR5900Analysis.h" #include "common/AlignedMalloc.h" #include "common/FastJmp.h" diff --git a/pcsx2/x86/ix86-32/iR5900Arit.cpp b/pcsx2/x86/ix86-32/iR5900Arit.cpp index 9ade81fc77..83db3ff2db 100644 --- a/pcsx2/x86/ix86-32/iR5900Arit.cpp +++ b/pcsx2/x86/ix86-32/iR5900Arit.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900AritImm.cpp b/pcsx2/x86/ix86-32/iR5900AritImm.cpp index 9f60af19b0..c26056441a 100644 --- a/pcsx2/x86/ix86-32/iR5900AritImm.cpp +++ b/pcsx2/x86/ix86-32/iR5900AritImm.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900Branch.cpp b/pcsx2/x86/ix86-32/iR5900Branch.cpp index 0d0211e344..e801088874 100644 --- a/pcsx2/x86/ix86-32/iR5900Branch.cpp +++ b/pcsx2/x86/ix86-32/iR5900Branch.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,14 +13,11 @@ * If not, see . */ - -// recompiler reworked to add dynamic linking zerofrog(@gmail.com) Jan06 - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900Jump.cpp b/pcsx2/x86/ix86-32/iR5900Jump.cpp index bdf2771a35..492c56681a 100644 --- a/pcsx2/x86/ix86-32/iR5900Jump.cpp +++ b/pcsx2/x86/ix86-32/iR5900Jump.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900LoadStore.cpp b/pcsx2/x86/ix86-32/iR5900LoadStore.cpp index f26d9ee2af..a69300756d 100644 --- a/pcsx2/x86/ix86-32/iR5900LoadStore.cpp +++ b/pcsx2/x86/ix86-32/iR5900LoadStore.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,13 +13,12 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900LoadStore.h" -#include "iR5900.h" +#include "x86/iR5900.h" +#include "x86/iR5900LoadStore.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900Move.cpp b/pcsx2/x86/ix86-32/iR5900Move.cpp index fc10125cb9..e98706ed53 100644 --- a/pcsx2/x86/ix86-32/iR5900Move.cpp +++ b/pcsx2/x86/ix86-32/iR5900Move.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp index 8c0a58a973..637d275943 100644 --- a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp +++ b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900Shift.cpp b/pcsx2/x86/ix86-32/iR5900Shift.cpp index 22368bc9a8..eb68c1d0d7 100644 --- a/pcsx2/x86/ix86-32/iR5900Shift.cpp +++ b/pcsx2/x86/ix86-32/iR5900Shift.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,12 +13,11 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900Templates.cpp b/pcsx2/x86/ix86-32/iR5900Templates.cpp index 53cc9a7e2b..69172a8fa5 100644 --- a/pcsx2/x86/ix86-32/iR5900Templates.cpp +++ b/pcsx2/x86/ix86-32/iR5900Templates.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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,14 +18,13 @@ #include "Common.h" #include "Memory.h" #include "R5900OpcodeTables.h" -#include "iR5900.h" -#include "iMMI.h" -#include "iFPU.h" -#include "iCOP0.h" #include "VU.h" #include "VUmicro.h" - #include "vtlb.h" +#include "x86/iCOP0.h" +#include "x86/iFPU.h" +#include "x86/iMMI.h" +#include "x86/iR5900.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/recVTLB.cpp b/pcsx2/x86/ix86-32/recVTLB.cpp index 5ee3679cb9..14268d2b26 100644 --- a/pcsx2/x86/ix86-32/recVTLB.cpp +++ b/pcsx2/x86/ix86-32/recVTLB.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team + * Copyright (C) 2002-2023 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- @@ -13,14 +13,13 @@ * If not, see . */ - #include "PrecompiledHeader.h" #include "Common.h" #include "vtlb.h" +#include "x86/iCore.h" +#include "x86/iR5900.h" -#include "iCore.h" -#include "iR5900.h" #include "common/Perf.h" using namespace vtlb_private; diff --git a/updater/updater.vcxproj b/updater/updater.vcxproj index f747a8d858..fc6446717f 100644 --- a/updater/updater.vcxproj +++ b/updater/updater.vcxproj @@ -20,7 +20,6 @@ - @@ -33,23 +32,12 @@ + $(SolutionDir)3rdparty\fmt\fmt\include;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\lzma\include;%(AdditionalIncludeDirectories) $(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories) - $(ProjectDir);%(AdditionalIncludeDirectories) - Async + $(SolutionDir)3rdparty\wil\include;%(AdditionalIncludeDirectories) NotUsing - NoExtensions - WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - NotSet - false - true - true - /Zc:__cplusplus /Zo /utf-8%(AdditionalOptions) - - Windows - Yes -