Skip to content

Commit f75d4de

Browse files
committed
Update project files
Change-Id: I6fbaf4b549627864704c5bdd7a7fc12d698e0d5f
1 parent df3e997 commit f75d4de

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

Build/VS2015/Documentation.vcxproj

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,18 @@
2727
</ImportGroup>
2828
<ImportGroup Label="PropertySheets">
2929
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
30+
<Import Project="GPA-Common.props" />
3031
</ImportGroup>
3132
<PropertyGroup Label="UserMacros" />
3233
<PropertyGroup>
3334
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
34-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
35-
<IntDir>$(Configuration)\</IntDir>
3635
</PropertyGroup>
37-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38-
<PreBuildEvent>
39-
<Message>
40-
</Message>
41-
<Command>
42-
</Command>
43-
</PreBuildEvent>
44-
</ItemDefinitionGroup>
4536
<ItemGroup>
4637
<CustomBuild Include="../../Doc/DoxyfilePublic">
4738
<FileType>Document</FileType>
4839
<Message Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">Generating Public Doxygen documentation</Message>
4940
<Command Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">"../../../Common/DK/Doxygen/doxygen-1.8.11/bin/doxygen.exe" "%(FullPath)"</Command>
50-
<Outputs Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">$(ProjectDir)public\html\index.html;%(Outputs)</Outputs>
41+
<Outputs Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">../../Doc/public\html\index.html;%(Outputs)</Outputs>
5142
</CustomBuild>
5243
</ItemGroup>
5344
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Build/VS2015/GPA-Common.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</PropertyGroup>
2525
<PropertyGroup>
2626
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
27-
<OutDir>$(MyBinDir)\</OutDir>
2827
</PropertyGroup>
2928
<ItemDefinitionGroup>
3029
<ClCompile>

Build/VS2015/PublicCounterCompiler.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
3434
<TargetFrameworkProfile />
35+
<BaseIntermediateOutputPath>..\..\Output\$(Configuration)\obj\PublicCounterCompiler</BaseIntermediateOutputPath>
3536
</PropertyGroup>
3637
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3738
<DebugSymbols>true</DebugSymbols>
3839
<DebugType>full</DebugType>
3940
<Optimize>false</Optimize>
40-
<OutputPath>bin\Debug\</OutputPath>
41+
<OutputPath>..\..\Output\Debug\bin\</OutputPath>
4142
<DefineConstants>DEBUG;TRACE</DefineConstants>
4243
<ErrorReport>prompt</ErrorReport>
4344
<WarningLevel>4</WarningLevel>
@@ -47,7 +48,7 @@
4748
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4849
<DebugType>pdbonly</DebugType>
4950
<Optimize>true</Optimize>
50-
<OutputPath>bin\Release\</OutputPath>
51+
<OutputPath>..\..\Output\Release\bin\</OutputPath>
5152
<DefineConstants>TRACE</DefineConstants>
5253
<ErrorReport>prompt</ErrorReport>
5354
<WarningLevel>4</WarningLevel>

0 commit comments

Comments
 (0)