Update vcxproj

JohnsonRan · Dec 6, 2024 · 77897d8 · 77897d8
1 parent be82a16
commit 77897d8
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,11 @@
 
 # Other junk
 .DS_Store
+
+src/.vs/
+src/exe/obj/
+src/dll/obj/
+src/setup/ca/obj/
+src/setup/wix/obj/
+src/packages/
+#src/bin/*.exe
diff --git a/src/dll/Shell.vcxproj b/src/dll/Shell.vcxproj
@@ -41,13 +41,12 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\shared\shared.vcxitems" Label="Shared" />
+    <Import Project="$(SolutionDir)shared\shared.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
+    <Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LibraryPath>$(SolutionDir)shared\Library;$(LibraryPath)</LibraryPath>
@@ -133,6 +132,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="$(SolutionDir)shared\packages.config" />
     <None Include="readme.txt" />
     <None Include="src\Shell.def" />
   </ItemGroup>
@@ -187,10 +187,7 @@
     <ClCompile Include="src\Initializer.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\shared\Resource\Shell.rc" />
+    <ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <None Include="..\shared\VC-LTL.props" />
-  </ItemGroup>
 </Project>
diff --git a/src/dll/Shell.vcxproj.filters b/src/dll/Shell.vcxproj.filters
@@ -36,9 +36,7 @@
     <None Include="src\Shell.def">
       <Filter>Others Files</Filter>
     </None>
-    <None Include="..\shared\VC-LTL.props">
-      <Filter>Others Files</Filter>
-    </None>
+    <None Include="$(SolutionDir)shared\packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Main.cpp">
@@ -183,7 +181,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\shared\Resource\Shell.rc">
+    <ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>

diff --git a/src/exe/exe.vcxproj b/src/exe/exe.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="release|ARM64">
       <Configuration>release</Configuration>
@@ -16,7 +17,8 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword></Keyword>
+    <Keyword>
+    </Keyword>
     <ProjectGuid>{FFFD0DDB-48FB-4681-A3B6-8E787FA98C98}</ProjectGuid>
     <RootNamespace>Shell</RootNamespace>
     <TargetName>shell</TargetName>
@@ -48,18 +50,18 @@
     <IncludePath>$(IncludePath)</IncludePath>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='release'">
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='release'">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\shared\shared.vcxitems" Label="Shared" />
+    <Import Project="$(SolutionDir)shared\shared.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
+    <Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -143,16 +145,14 @@
     <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\shared\Resource\Shell.rc" />
+    <ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\shared\Resource\resource.h" />
+    <ClInclude Include="$(SolutionDir)shared\Resource\resource.h" />
     <ClInclude Include="src\Control.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
   <ItemGroup>
-    <None Include="..\shared\VC-LTL.props" />
+    <None Include="$(SolutionDir)shared\packages.config" />
   </ItemGroup>
 </Project>
diff --git a/src/exe/exe.vcxproj.filters b/src/exe/exe.vcxproj.filters
@@ -23,21 +23,22 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\shared\Resource\Shell.rc">
+    <ResourceCompile Include="$(SolutionDir)shared\Resource\Shell.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\shared\Resource\resource.h">
+    <ClInclude Include="$(SolutionDir)shared\Resource\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Control.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\shared\VC-LTL.props">
+    <None Include="$(SolutionDir)shared\VC-LTL.props">
       <Filter>Others Files</Filter>
     </None>
+    <None Include="$(SolutionDir)shared\packages.config" />
   </ItemGroup>
 </Project>
diff --git a/src/setup/ca/ca.vcxproj b/src/setup/ca/ca.vcxproj
@@ -30,6 +30,8 @@
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)shared\VC-LTL.props" Condition="Exists('$(SolutionDir)shared\VC-LTL.props')" />
+
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>msi.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
@@ -76,9 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ca.def" />
+    <None Include="$(SolutionDir)shared\packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\..\shared\VC-LTL.props" Condition="'$(Configuration)|$(Platform)'=='release|$(Platform)'" />
-  </ImportGroup>
 </Project>
diff --git a/src/shared/VC-LTL.props b/src/shared/VC-LTL.props
@@ -34,15 +34,9 @@ If you are not satisfied with the default search order, you can modify this file
 		<!--<SupportWinXP>true</SupportWinXP>-->
 	</PropertyGroup>
 
-
 	<PropertyGroup>
 		<!--Shared.props file root directory exists VC-LTL? -->
-		<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(MSBuildThisFileDirectory)_msvcrt.h')) ">$(MSBuildThisFileDirectory)</VC_LTL_Root>
-		<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(ProjectDir)VC-LTL\_msvcrt.h')) ">$(ProjectDir)VC-LTL</VC_LTL_Root>
-		<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And ('$(SolutionDir)'!='') And (Exists('$(SolutionDir)VC-LTL\_msvcrt.h')) ">$(SolutionDir)VC-LTL</VC_LTL_Root>
-		<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And (Exists('$(ProjectDir)..\VC-LTL\_msvcrt.h')) ">$(ProjectDir)..\VC-LTL</VC_LTL_Root>
-		<VC_LTL_Root Condition=" ('$(VC_LTL_Root)'=='') And ('$(SolutionDir)'!='') And (Exists('$(SolutionDir)..\VC-LTL\_msvcrt.h')) ">$(SolutionDir)..\VC-LTL</VC_LTL_Root>
-		<VC_LTL_Root Condition=" '$(VC_LTL_Root)'=='' ">$(Registry:HKEY_CURRENT_USER\Code\VC-LTL@Root)</VC_LTL_Root>
+		<VC_LTL_Root Condition=" '$(VC_LTL_Root)'=='' ">$(SolutionDir)packages\VC-LTL.5.1.1\build\native</VC_LTL_Root>
 	</PropertyGroup>
 
 	<ImportGroup Condition=" '$(VC_LTL_Root)'!=''">