From 612abae95a34eabf9157335b08d8cb1114bd6700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bo=20Brant=C3=A9n?= <bosse@acc.umu.se>
Date: Fri, 12 Jun 2020 21:55:33 +0200
Subject: [PATCH] improved the project dependencies

---
 Ext2Mgr/Ext2Mgr.rc      |  6 +-----
 Ext2Mgr/Ext2Mgr.vcxproj | 10 ++++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Ext2Mgr/Ext2Mgr.rc b/Ext2Mgr/Ext2Mgr.rc
index 8fd07f5..f4eef16 100644
--- a/Ext2Mgr/Ext2Mgr.rc
+++ b/Ext2Mgr/Ext2Mgr.rc
@@ -466,11 +466,7 @@ END
 // RCDATA
 //
 
-#ifdef _WIN64
-IDR_RCDAT_SRV           RCDATA                  "..\\Ext2Srv\\Release\\X64\\Ext2Srv.exe"
-#else
-IDR_RCDAT_SRV           RCDATA                  "..\\Ext2Srv\\Release\\X86\\Ext2Srv.exe"
-#endif
+IDR_RCDAT_SRV           RCDATA                  "Ext2Srv.exe"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Ext2Mgr/Ext2Mgr.vcxproj b/Ext2Mgr/Ext2Mgr.vcxproj
index 0d37259..311a01d 100644
--- a/Ext2Mgr/Ext2Mgr.vcxproj
+++ b/Ext2Mgr/Ext2Mgr.vcxproj
@@ -109,6 +109,9 @@
       <AdditionalDependencies>ntdll.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Ext2Srv\$(Configuration)\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -127,7 +130,7 @@
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)Ext2Srv\$(Configuration)\x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -150,6 +153,9 @@
       <AdditionalDependencies>ntdll.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Ext2Srv\$(Configuration)\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -172,7 +178,7 @@
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)Ext2Srv\$(Configuration)\x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>