Skip to content

Commit

Permalink
Fix link options
Browse files Browse the repository at this point in the history
  • Loading branch information
q committed Nov 19, 2019
1 parent 61a56ba commit a03cf64
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 27 deletions.
10 changes: 4 additions & 6 deletions src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
<ProjectName>PublicTerminalCore</ProjectName>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>

<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
<Import Project="$(SolutionDir)src\common.build.pre.props" />

<ItemGroup>
<ClCompile Include="pch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
Expand All @@ -22,7 +20,6 @@
<ClInclude Include="HwndTerminal.hpp" />
<ClInclude Include="pch.h" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\terminal\input\lib\terminalinput.vcxproj">
<Project>{1cf55140-ef6a-4736-a403-957e4f7430bb}</Project>
Expand All @@ -46,12 +43,13 @@
<Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
</ProjectReference>
</ItemGroup>

<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<AdditionalDependencies>d3dcompiler.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

<Import Project="$(SolutionDir)src\common.build.post.props" />
</Project>
</Project>
16 changes: 0 additions & 16 deletions src/common.build.exe.props

This file was deleted.

5 changes: 3 additions & 2 deletions src/host/exe/Host.EXE.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>HostEXE</RootNamespace>
<ProjectName>Host.EXE</ProjectName>
<TargetName>OpenConsole</TargetName>
<ConfigurationType>Application</ConfigurationType>
<ConfigurationType>Application</ConfigurationType>
</PropertyGroup>
<Import Project="..\..\common.build.pre.props" />
<ItemGroup>
Expand Down Expand Up @@ -84,8 +84,9 @@
</ClCompile>
<Link>
<AllowIsolation>true</AllowIsolation>
<AdditionalDependencies>d3dcompiler.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
<Import Project="..\..\common.build.post.props" />
</Project>
</Project>
3 changes: 3 additions & 0 deletions src/host/exe/Host.EXE.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@
<ItemGroup>
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
</ItemGroup>
<ItemGroup>
<Manifest Include="openconsole.exe.manifest" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion src/host/ut_host/Host.UnitTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>HostUnitTests</RootNamespace>
<ProjectName>Host.Tests.Unit</ProjectName>
<TargetName>Conhost.Unit.Tests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(SolutionDir)src\common.build.pre.props" />
<ItemGroup>
Expand Down Expand Up @@ -102,6 +102,9 @@
<ClCompile>
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(SolutionDir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>d3dcompiler.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
<Import Project="$(SolutionDir)src\common.build.post.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>InteractivityWin32UnitTests</RootNamespace>
<ProjectName>Interactivity.Win32.Tests.Unit</ProjectName>
<TargetName>Conhost.Interactivity.Win32.Unit.Tests</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(SolutionDir)src\common.build.pre.props" />
<ItemGroup>
Expand Down Expand Up @@ -69,8 +69,11 @@
<ClCompile>
<AdditionalIncludeDirectories>..;$(SolutionDir)src\inc;$(Solutiondir)src\inc\test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>d3dcompiler.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
<Import Project="$(SolutionDir)src\common.build.post.props" />
<Import Project="$(SolutionDir)src\common.build.tests.props" />
</Project>
</Project>

0 comments on commit a03cf64

Please sign in to comment.