diff --git a/.gitignore b/.gitignore index 2a4064da2e..60e448e772 100644 --- a/.gitignore +++ b/.gitignore @@ -23,13 +23,6 @@ *.VC.db *.VC.VC.opendb -**/Win32/Release* -**/Win32/Debug* -**/Win32/Devel* -**/x64/Release* -**/x64/Debug* -**/x64/Devel* - _ReSharper.* pcsx2.snapshot_* svnrev.h diff --git a/3rdparty/3rdparty.props b/3rdparty/3rdparty.props index 5dd7d52112..edfdf59894 100644 --- a/3rdparty/3rdparty.props +++ b/3rdparty/3rdparty.props @@ -2,8 +2,8 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)deps\$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(SolutionDir)build\3rdparty\lib-$(PlatformName)-$(Configuration)\ + $(SolutionDir)build\3rdparty\obj-$(ProjectName)-$(PlatformName)-$(Configuration)\ *.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) diff --git a/common/common.vcxproj b/common/common.vcxproj index f5300e575b..9a6688176d 100644 --- a/common/common.vcxproj +++ b/common/common.vcxproj @@ -21,7 +21,6 @@ - diff --git a/common/vsprops/BaseProperties.props b/common/vsprops/BaseProperties.props index 9c4aff3849..4b4f46dfae 100644 --- a/common/vsprops/BaseProperties.props +++ b/common/vsprops/BaseProperties.props @@ -2,6 +2,6 @@ $(SolutionDir)bin\ - $(PlatformName)\$(Configuration)\ + $(SolutionDir)bin-arm64\ \ No newline at end of file diff --git a/common/vsprops/CodeGen_Debug.props b/common/vsprops/CodeGen_Debug.props index bd3cc45ea8..db3b56a830 100644 --- a/common/vsprops/CodeGen_Debug.props +++ b/common/vsprops/CodeGen_Debug.props @@ -1,9 +1,5 @@  - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectName)-dbg - Disabled diff --git a/common/vsprops/CodeGen_Devel.props b/common/vsprops/CodeGen_Devel.props index b0ea7c4a77..d23edbdde3 100644 --- a/common/vsprops/CodeGen_Devel.props +++ b/common/vsprops/CodeGen_Devel.props @@ -1,9 +1,5 @@  - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectName)-dev - MaxSpeed diff --git a/common/vsprops/CodeGen_Release.props b/common/vsprops/CodeGen_Release.props index 380bd35b2c..07f1071d0d 100644 --- a/common/vsprops/CodeGen_Release.props +++ b/common/vsprops/CodeGen_Release.props @@ -1,8 +1,6 @@  - <_ProjectFileVersion>10.0.30128.1 - $(ProjectName) false diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props deleted file mode 100644 index 107d723b6c..0000000000 --- a/common/vsprops/CommonLibrary.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - $(SolutionDir)deps\$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - \ No newline at end of file diff --git a/common/vsprops/QtCompile.props b/common/vsprops/QtCompile.props index e3caedf6c2..954f2028bc 100644 --- a/common/vsprops/QtCompile.props +++ b/common/vsprops/QtCompile.props @@ -85,11 +85,11 @@ BeforeTargets="ClCompile" Condition="'@(QtMoc)'!=''" Inputs="%(QtMoc.Identity);%(QtMoc.AdditionalDependencies);$(MSBuildProjectFile)" - Outputs="$(QtToolOutDir)%(QtMoc.RelativeDir)moc_%(QtMoc.Filename).cpp"> - + Outputs="$(QtToolOutDir)moc_%(QtMoc.Filename).cpp"> + - + diff --git a/common/vsprops/common.props b/common/vsprops/common.props index def25cc168..d0a8e0489d 100644 --- a/common/vsprops/common.props +++ b/common/vsprops/common.props @@ -12,6 +12,10 @@ -clang $(ProjectName)$(ArchString)$(SSEString)$(ToolkitString)$(BuildString) + + $(SolutionDir)build\lib-$(PlatformName)-$(Configuration)\ + $(SolutionDir)build\obj-$(ProjectName)-$(PlatformName)-$(Configuration)\ + false @@ -34,7 +38,6 @@ true false true - $(IntDir)%(RelativeDir) diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index 619c177289..b7b5da67a4 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -20,7 +20,6 @@ - @@ -30,7 +29,6 @@ AllRules.ruleset - pcsx2 @@ -67,6 +65,7 @@ PrecompiledHeader.h;%(ForcedIncludeFiles) LZMA_API_STATIC;ST_NO_EXCEPTION_HANDLING;ENABLE_DISCORD_PRESENCE;ENABLE_RAINTEGRATION;ENABLE_ACHIEVEMENTS;ENABLE_OPENGL;ENABLE_VULKAN;SPU2X_CUBEB;SDL_BUILD;%(PreprocessorDefinitions) XBYAK_NO_EXCEPTION;ZYCORE_STATIC_DEFINE;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions) + $(IntDir)%(RelativeDir)