Skip to content

Commit bc2ef77

Browse files
baldurkbaldurk
committed
Centralise object file dirs in VS so they're not all over the tree
1 parent 2ce1338 commit bc2ef77

17 files changed

Lines changed: 301 additions & 307 deletions

‎pdblocate/pdblocate.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,31 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
</ImportGroup>
3939
<PropertyGroup Label="UserMacros" />
40+
<PropertyGroup>
41+
</PropertyGroup>
4042
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'">
4143
<LinkIncremental>false</LinkIncremental>
4244
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(IncludePath)</IncludePath>
4345
<OutDir>$(SolutionDir)x64\Release\pdblocate\</OutDir>
46+
<IntDir>$(SolutionDir)x64\Release\obj\$(ProjectName)\</IntDir>
4447
</PropertyGroup>
4548
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release32|Win32'">
4649
<LinkIncremental>false</LinkIncremental>
4750
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(IncludePath)</IncludePath>
4851
<OutDir>$(SolutionDir)Win32\Release\pdblocate\</OutDir>
52+
<IntDir>$(SolutionDir)Win32\Release\obj\$(ProjectName)\</IntDir>
4953
</PropertyGroup>
5054
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development64|Win32'">
5155
<LinkIncremental>false</LinkIncremental>
5256
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(IncludePath)</IncludePath>
5357
<OutDir>$(SolutionDir)x64\Development\pdblocate\</OutDir>
58+
<IntDir>$(SolutionDir)x64\Development\obj\$(ProjectName)\</IntDir>
5459
</PropertyGroup>
5560
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development32|Win32'">
5661
<LinkIncremental>false</LinkIncremental>
5762
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(IncludePath)</IncludePath>
5863
<OutDir>$(SolutionDir)Win32\Development\pdblocate\</OutDir>
64+
<IntDir>$(SolutionDir)Win32\Development\obj\$(ProjectName)\</IntDir>
5965
</PropertyGroup>
6066
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|Win32'">
6167
<ClCompile>

‎qrenderdoc/qrenderdoc_local.vcxproj‎

Lines changed: 244 additions & 260 deletions
Large diffs are not rendered by default.

‎renderdoc/3rdparty/breakpad/client/windows/common.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
3636
</ImportGroup>
3737
<PropertyGroup Label="UserMacros" />
38+
<PropertyGroup>
39+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
40+
</PropertyGroup>
3841
<PropertyGroup>
3942
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\third_party\python_26\</ExecutablePath>
40-
<OutDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\</OutDir>
41-
<IntDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
43+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
4244
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
4345
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4446
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">true</LinkIncremental>

‎renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
3535
</ImportGroup>
3636
<PropertyGroup Label="UserMacros" />
37+
<PropertyGroup>
38+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
39+
</PropertyGroup>
3740
<PropertyGroup>
3841
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\</ExecutablePath>
39-
<OutDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\</OutDir>
40-
<IntDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
42+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
4143
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
4244
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4345
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">true</LinkIncremental>

‎renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
3535
</ImportGroup>
3636
<PropertyGroup Label="UserMacros" />
37+
<PropertyGroup>
38+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
39+
</PropertyGroup>
3740
<PropertyGroup>
3841
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\</ExecutablePath>
39-
<OutDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\</OutDir>
40-
<IntDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
42+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
4143
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
4244
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4345
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">true</LinkIncremental>

‎renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
3535
</ImportGroup>
3636
<PropertyGroup Label="UserMacros" />
37+
<PropertyGroup>
38+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
39+
</PropertyGroup>
3740
<PropertyGroup>
3841
<ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\</ExecutablePath>
39-
<OutDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\</OutDir>
40-
<IntDir>$(SolutionDir)renderdoc\3rdparty\breakpad\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
42+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
4143
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
4244
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
4345
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">true</LinkIncremental>

‎renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup>
67+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
68+
</PropertyGroup>
6669
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6770
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
68-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
6971
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7072
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
7173
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -74,7 +76,6 @@
7476
</PropertyGroup>
7577
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|x64'">
7678
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
77-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7879
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7980
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8081
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -83,7 +84,6 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
86-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8787
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
8888
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8989
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -96,7 +96,6 @@
9696
<LibraryPath>$(LibraryPath)</LibraryPath>
9797
<ExcludePath>$(ExcludePath)</ExcludePath>
9898
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
99-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
10099
<TargetName>driver_$(ProjectName)</TargetName>
101100
</PropertyGroup>
102101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">

‎renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup>
67+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
68+
</PropertyGroup>
6669
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6770
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
68-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
6971
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7072
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
7173
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -74,7 +76,6 @@
7476
</PropertyGroup>
7577
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|x64'">
7678
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
77-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7879
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7980
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8081
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -83,7 +84,6 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
86-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8787
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
8888
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8989
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -96,7 +96,6 @@
9696
<LibraryPath>$(LibraryPath)</LibraryPath>
9797
<ExcludePath>$(ExcludePath)</ExcludePath>
9898
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
99-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
10099
<TargetName>driver_$(ProjectName)</TargetName>
101100
</PropertyGroup>
102101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">

‎renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup>
67+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
68+
</PropertyGroup>
6669
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6770
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
68-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
6971
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7072
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
7173
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -74,7 +76,6 @@
7476
</PropertyGroup>
7577
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|x64'">
7678
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
77-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7879
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7980
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8081
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -83,7 +84,6 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
86-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8787
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
8888
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8989
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -96,7 +96,6 @@
9696
<LibraryPath>$(LibraryPath)</LibraryPath>
9797
<ExcludePath>$(ExcludePath)</ExcludePath>
9898
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
99-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
10099
<TargetName>driver_$(ProjectName)</TargetName>
101100
</PropertyGroup>
102101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">

‎renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup>
67+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
68+
</PropertyGroup>
6669
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6770
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
68-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
6971
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7072
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
7173
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -74,7 +76,6 @@
7476
</PropertyGroup>
7577
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Development|x64'">
7678
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
77-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7879
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
7980
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8081
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -83,7 +84,6 @@
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8586
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
86-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8787
<ExecutablePath>$(ExecutablePath)</ExecutablePath>
8888
<IncludePath>$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
8989
<LibraryPath>$(LibraryPath)</LibraryPath>
@@ -96,7 +96,6 @@
9696
<LibraryPath>$(LibraryPath)</LibraryPath>
9797
<ExcludePath>$(ExcludePath)</ExcludePath>
9898
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
99-
<IntDir>$(Platform)\$(Configuration)\</IntDir>
10099
<TargetName>driver_$(ProjectName)</TargetName>
101100
</PropertyGroup>
102101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Development|Win32'">

0 commit comments

Comments
 (0)