From 4fc1ecfeee669c23539f8324ae9cc3e095903875 Mon Sep 17 00:00:00 2001
From: Yi Huang <huanyi@microsoft.com>
Date: Thu, 18 Jul 2024 13:36:14 -0700
Subject: [PATCH] Use windows style output path only when built as a dep

---
 src/cxplat.props                                 | 2 +-
 src/lib/cxplat.kernel.vcxproj                    | 4 +++-
 src/lib/cxplat.user.vcxproj                      | 4 +++-
 src/test/bin/winkernel/cxplattest.kernel.vcxproj | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/cxplat.props b/src/cxplat.props
index b298bcc..4b01aae 100644
--- a/src/cxplat.props
+++ b/src/cxplat.props
@@ -18,7 +18,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
-    <!-- Configuration properties to match Windows -->
+    <!-- Configuration properties to match Windows. These are used when built as a dependency. -->
     <WinConfig Condition="'$(Configuration)' == 'Release'">fre</WinConfig>
     <WinConfig Condition="'$(Configuration)' == 'Debug'">chk</WinConfig>
     <WinPlat Condition="'$(Platform)' == 'Win32'">x86</WinPlat>
diff --git a/src/lib/cxplat.kernel.vcxproj b/src/lib/cxplat.kernel.vcxproj
index 29282f8..7fb8493 100644
--- a/src/lib/cxplat.kernel.vcxproj
+++ b/src/lib/cxplat.kernel.vcxproj
@@ -38,7 +38,9 @@
   <PropertyGroup>
     <TargetName>cxplat</TargetName>
     <IntDir>$(SolutionDir)build\winkernel\$(Platform)_$(Configuration)\obj\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)artifacts\bin\$(WinPlat)$(WinConfig)\winkernel\</OutDir>
+    <OutDir Condition="'$(SolutionName)' == 'cxplat.kernel'">$(SolutionDir)artifacts\bin\winkernel\$(Platform)_$(Configuration)\</OutDir>
+    <!-- Output path when built as a dependency -->
+    <OutDir Condition="'$(SolutionName)' != 'cxplat.kernel'">$(SolutionDir)artifacts\bin\$(WinPlat)$(WinConfig)\cxplat\winkernel\</OutDir>
   </PropertyGroup>
   <PropertyGroup>
     <ExternalIncludePath />
diff --git a/src/lib/cxplat.user.vcxproj b/src/lib/cxplat.user.vcxproj
index 523ad00..ed7ed6b 100644
--- a/src/lib/cxplat.user.vcxproj
+++ b/src/lib/cxplat.user.vcxproj
@@ -35,7 +35,9 @@
   <PropertyGroup>
     <TargetName>cxplat</TargetName>
     <IntDir>$(SolutionDir)build\winuser\$(Platform)_$(Configuration)\obj\$(ProjectName)\</IntDir>
-    <OutDir>$(SolutionDir)artifacts\bin\$(WinPlat)$(WinConfig)\winuser\</OutDir>
+    <OutDir Condition="'$(SolutionName)' == 'cxplat.winuser'">$(SolutionDir)artifacts\bin\winuser\$(Platform)_$(Configuration)\</OutDir>
+    <!-- Output path when built as a dependency -->
+    <OutDir Condition="'$(SolutionName)' != 'cxplat.winuser'">$(SolutionDir)artifacts\bin\$(WinPlat)$(WinConfig)\cxplat\winuser\</OutDir>
   </PropertyGroup>
   <PropertyGroup>
     <ExternalIncludePath />
diff --git a/src/test/bin/winkernel/cxplattest.kernel.vcxproj b/src/test/bin/winkernel/cxplattest.kernel.vcxproj
index 969d0ef..a7fbd42 100644
--- a/src/test/bin/winkernel/cxplattest.kernel.vcxproj
+++ b/src/test/bin/winkernel/cxplattest.kernel.vcxproj
@@ -58,7 +58,7 @@
       <AdditionalOptions Condition="'$(Platform)'=='x64'">/Gw /kernel /ZH:SHA_256 -d2jumptablerdata -d2epilogunwindrequirev2</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)artifacts\bin\$(WinPlat)$(WinConfig)\winkernel\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)artifacts\bin\winkernel\$(Platform)_$(Configuration)\</AdditionalLibraryDirectories>
       <AdditionalDependencies>cng.lib;ksecdd.lib;wdmsec.lib;uuid.lib;cxplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>