Skip to content

Commit 77897d8

Browse files
moudeymoudey
committed
Update vcxproj
1 parent be82a16 commit 77897d8

File tree

7 files changed

+31
-33
lines changed

7 files changed

+31
-33
lines changed

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@
3232

3333
# Other junk
3434
.DS_Store
35+
36+
src/.vs/
37+
src/exe/obj/
38+
src/dll/obj/
39+
src/setup/ca/obj/
40+
src/setup/wix/obj/
41+
src/packages/
42+
#src/bin/*.exe

‎src/dll/Shell.vcxproj

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@
4141
<ImportGroup Label="ExtensionSettings">
4242
</ImportGroup>
4343
<ImportGroup Label="Shared">
44-
<Import Project="..\shared\shared.vcxitems" Label="Shared" />
44+
<Import Project="$(SolutionDir)shared\shared.vcxitems" Label="Shared" />
4545
</ImportGroup>
4646
<ImportGroup Label="PropertySheets">
4747
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48-
<Import Project="..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
48+
<Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
4949
</ImportGroup>
50-
<ImportGroup Label="PropertySheets" />
5150
<PropertyGroup Label="UserMacros" />
5251
<PropertyGroup>
5352
<LibraryPath>$(SolutionDir)shared\Library;$(LibraryPath)</LibraryPath>
@@ -133,6 +132,7 @@
133132
</Link>
134133
</ItemDefinitionGroup>
135134
<ItemGroup>
135+
<None Include="$(SolutionDir)shared\packages.config" />
136136
<None Include="readme.txt" />
137137
<None Include="src\Shell.def" />
138138
</ItemGroup>
@@ -187,10 +187,7 @@
187187
<ClCompile Include="src\Initializer.cpp" />
188188
</ItemGroup>
189189
<ItemGroup>
190-
<ResourceCompile Include="..\shared\Resource\Shell.rc" />
190+
<ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc" />
191191
</ItemGroup>
192192
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
193-
<ItemGroup>
194-
<None Include="..\shared\VC-LTL.props" />
195-
</ItemGroup>
196193
</Project>

‎src/dll/Shell.vcxproj.filters

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
<None Include="src\Shell.def">
3737
<Filter>Others Files</Filter>
3838
</None>
39-
<None Include="..\shared\VC-LTL.props">
40-
<Filter>Others Files</Filter>
41-
</None>
39+
<None Include="$(SolutionDir)shared\packages.config" />
4240
</ItemGroup>
4341
<ItemGroup>
4442
<ClCompile Include="src\Main.cpp">
@@ -183,7 +181,7 @@
183181
</ClInclude>
184182
</ItemGroup>
185183
<ItemGroup>
186-
<ResourceCompile Include="..\shared\Resource\Shell.rc">
184+
<ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc">
187185
<Filter>Resource Files</Filter>
188186
</ResourceCompile>
189187
</ItemGroup>

‎src/exe/exe.vcxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
34
<ItemGroup Label="ProjectConfigurations">
45
<ProjectConfiguration Include="release|ARM64">
56
<Configuration>release</Configuration>
@@ -16,7 +17,8 @@
1617
</ItemGroup>
1718
<PropertyGroup Label="Globals">
1819
<VCProjectVersion>16.0</VCProjectVersion>
19-
<Keyword></Keyword>
20+
<Keyword>
21+
</Keyword>
2022
<ProjectGuid>{FFFD0DDB-48FB-4681-A3B6-8E787FA98C98}</ProjectGuid>
2123
<RootNamespace>Shell</RootNamespace>
2224
<TargetName>shell</TargetName>
@@ -48,18 +50,18 @@
4850
<IncludePath>$(IncludePath)</IncludePath>
4951
</PropertyGroup>
5052
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
51-
<PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='release'">
53+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='release'">
5254
<UseDebugLibraries>false</UseDebugLibraries>
5355
</PropertyGroup>
5456
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5557
<ImportGroup Label="ExtensionSettings">
5658
</ImportGroup>
5759
<ImportGroup Label="Shared">
58-
<Import Project="..\shared\shared.vcxitems" Label="Shared" />
60+
<Import Project="$(SolutionDir)shared\shared.vcxitems" Label="Shared" />
5961
</ImportGroup>
6062
<ImportGroup Label="PropertySheets">
6163
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62-
<Import Project="..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
64+
<Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
6365
</ImportGroup>
6466
<PropertyGroup Label="UserMacros" />
6567
<PropertyGroup>
@@ -143,16 +145,14 @@
143145
<ClCompile Include="src\main.cpp" />
144146
</ItemGroup>
145147
<ItemGroup>
146-
<ResourceCompile Include="..\shared\Resource\Shell.rc" />
148+
<ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc" />
147149
</ItemGroup>
148150
<ItemGroup>
149-
<ClInclude Include="..\shared\Resource\resource.h" />
151+
<ClInclude Include="$(SolutionDir)shared\Resource\resource.h" />
150152
<ClInclude Include="src\Control.h" />
151153
</ItemGroup>
152154
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
153-
<ImportGroup Label="ExtensionTargets">
154-
</ImportGroup>
155155
<ItemGroup>
156-
<None Include="..\shared\VC-LTL.props" />
156+
<None Include="$(SolutionDir)shared\packages.config" />
157157
</ItemGroup>
158158
</Project>

‎src/exe/exe.vcxproj.filters

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,22 @@
2323
</ClCompile>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<ResourceCompile Include="..\shared\Resource\Shell.rc">
26+
<ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc">
2727
<Filter>Resource Files</Filter>
2828
</ResourceCompile>
2929
</ItemGroup>
3030
<ItemGroup>
31-
<ClInclude Include="..\shared\Resource\resource.h">
31+
<ClInclude Include="$(SolutionDir)shared\Resource\resource.h">
3232
<Filter>Header Files</Filter>
3333
</ClInclude>
3434
<ClInclude Include="src\Control.h">
3535
<Filter>Header Files</Filter>
3636
</ClInclude>
3737
</ItemGroup>
3838
<ItemGroup>
39-
<None Include="..\shared\VC-LTL.props">
39+
<None Include="$(SolutionDir)shared\VC-LTL.props">
4040
<Filter>Others Files</Filter>
4141
</None>
42+
<None Include="$(SolutionDir)shared\packages.config" />
4243
</ItemGroup>
4344
</Project>

‎src/setup/ca/ca.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<PlatformToolset>v143</PlatformToolset>
3131
</PropertyGroup>
3232
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
33+
<Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
34+
3335
<PropertyGroup>
3436
<ProjectAdditionalLinkLibraries>msi.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
3537
</PropertyGroup>
@@ -76,9 +78,7 @@
7678
</ItemGroup>
7779
<ItemGroup>
7880
<None Include="ca.def" />
81+
<None Include="$(SolutionDir)shared\packages.config" />
7982
</ItemGroup>
8083
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
81-
<ImportGroup Label="PropertySheets">
82-
<Import Project="..\..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
83-
</ImportGroup>
8484
</Project>

‎src/shared/VC-LTL.props

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,9 @@ If you are not satisfied with the default search order, you can modify this file
3434
<!--<SupportWinXP>true</SupportWinXP>-->
3535
</PropertyGroup>
3636

37-
3837
<PropertyGroup>
3938
<!--Shared.props file root directory exists VC-LTL? -->
40-
<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(MSBuildThisFileDirectory)_msvcrt.h')) ">$(MSBuildThisFileDirectory)</VC_LTL_Root>
41-
<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(ProjectDir)VC-LTL\_msvcrt.h')) ">$(ProjectDir)VC-LTL</VC_LTL_Root>
42-
<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And ('$(SolutionDir)'!='') And (Exists('$(SolutionDir)VC-LTL\_msvcrt.h')) ">$(SolutionDir)VC-LTL</VC_LTL_Root>
43-
<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(ProjectDir)..\VC-LTL\_msvcrt.h')) ">$(ProjectDir)..\VC-LTL</VC_LTL_Root>
44-
<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And ('$(SolutionDir)'!='') And (Exists('$(SolutionDir)..\VC-LTL\_msvcrt.h')) ">$(SolutionDir)..\VC-LTL</VC_LTL_Root>
45-
<VC_LTL_Root Condition=" '$(VC_LTL_Root)'=='' ">$(Registry:HKEY_CURRENT_USER\Code\VC-LTL@Root)</VC_LTL_Root>
39+
<VC_LTL_Root Condition=" '$(VC_LTL_Root)'=='' ">$(SolutionDir)packages\VC-LTL.5.1.1\build\native</VC_LTL_Root>
4640
</PropertyGroup>
4741

4842
<ImportGroup Condition=" '$(VC_LTL_Root)'!=''">

0 commit comments

Comments
 (0)