From 244f0c1e5e187dd3c128924025d4672e6a42645c Mon Sep 17 00:00:00 2001
From: Ratin Gao <ratin@knsoft.org>
Date: Mon, 30 Sep 2024 01:35:16 +0800
Subject: [PATCH] [MSBUILD] Update MSBuild sheets

---
 Source/Directory.Build.props | 7 ++++---
 Source/KNSoft.NDK.targets    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index d0a5652..9ef30f1 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -10,6 +10,7 @@
             <LanguageStandard>stdcpplatest</LanguageStandard>
             <LanguageStandard_C>stdc17</LanguageStandard_C>
             <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+            <ObjectFileName>$(IntDir)%(Directory)</ObjectFileName>
         </ClCompile>
     </ItemDefinitionGroup>
 
@@ -41,7 +42,7 @@
             <PreprocessorDefinitions>MSB_VCTOOLS_VERSION="$(VCToolsVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
             <PreprocessorDefinitions>MSB_PLATFORM_TOOLSET="$(PlatformToolset)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
             <PreprocessorDefinitions>MSB_PLATFORM_TOOLSET_VERSION="$(PlatformToolsetVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-            <PreprocessorDefinitions>MSB_PLATFORM_TARGET_VERSION="$(PlatformTarget)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+            <PreprocessorDefinitions>MSB_PLATFORM_TARGET="$(PlatformTarget)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
             <PreprocessorDefinitions>MSB_TARGET_PLATFORM_VERSION="$(TargetPlatformVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
             <PreprocessorDefinitions>MSB_TARGET_PLATFORM_DISPLAY_NAME="$(TargetPlatformDisplayName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
         </ClCompile>
@@ -59,9 +60,9 @@
         </ClCompile>
     </ItemDefinitionGroup>
 
-    <!-- Import $(ProjectName).Build.props if exists -->
+    <!-- Import $(MSBuildProjectName).Build.props if exists -->
     <PropertyGroup>
-        <ProjectNameBuildPropsPath>$(MSBuildProjectDirectory)\$(ProjectName).Build.props</ProjectNameBuildPropsPath>
+        <ProjectNameBuildPropsPath>$(MSBuildProjectDirectory)\$(MSBuildProjectName).Build.props</ProjectNameBuildPropsPath>
     </PropertyGroup>
     <Import Project="$(ProjectNameBuildPropsPath)" Condition="Exists('$(ProjectNameBuildPropsPath)')"/>
     
diff --git a/Source/KNSoft.NDK.targets b/Source/KNSoft.NDK.targets
index 202c623..0a30777 100644
--- a/Source/KNSoft.NDK.targets
+++ b/Source/KNSoft.NDK.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <IncludePath>$(MSBuildThisFileDirectory)Include;$(MSBuildThisFileDirectory)Include\KNSoft\NDK\3rdParty\phnt;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)Include;$(IncludePath)</IncludePath>
     <LibraryPath>$(MSBuildThisFileDirectory)Lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>