From 24be3d34f63a5a13d9a65bc0c9b122fc9f737cf1 Mon Sep 17 00:00:00 2001
From: berryzplus <berryzplus@gmail.com>
Date: Tue, 18 Jun 2024 21:19:32 +0900
Subject: [PATCH] =?UTF-8?q?vcpkg.exe=E3=81=AE=E3=83=91=E3=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-sln.bat           | 5 -----
 sakura/funccode.targets | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build-sln.bat b/build-sln.bat
index e44334ba91..42e42eae2a 100644
--- a/build-sln.bat
+++ b/build-sln.bat
@@ -19,11 +19,6 @@ if "%configuration%" == "Release" (
 	call :showhelp %0
 	exit /b 1
 )
-
-set path=%path%;%VCPKG_INSTALLATION_ROOT%
-
-vcpkg.exe integrate install
-
 if not defined CMD_MSBUILD call %~dp0tools\find-tools.bat
 if not defined CMD_MSBUILD (
 	echo msbuild.exe was not found.
diff --git a/sakura/funccode.targets b/sakura/funccode.targets
index 35b161f121..96a8beb841 100644
--- a/sakura/funccode.targets
+++ b/sakura/funccode.targets
@@ -9,6 +9,7 @@
     <VcpkgUseStatic>true</VcpkgUseStatic>
   </PropertyGroup>
   <PropertyGroup Label="FuncCode">
+    <ExecutablePath Condition="'$(VcpkgRoot)'!=''">$(VcpkgRoot);$(ExecutablePath)</ExecutablePath>
     <HeaderMake>$(VcpkgInstalledDir)$(VcpkgTriplet)\tools\header-make\HeaderMake.exe</HeaderMake>
     <FuncCodeDefine>..\sakura_core\Funccode_define.h</FuncCodeDefine>
     <FuncCodeEnum>..\sakura_core\Funccode_enum.h</FuncCodeEnum>
@@ -17,7 +18,7 @@
       Condition="!Exists('$(HeaderMake)')"
       AfterTargets="GenerateGitHash"
       BeforeTargets="FuncCodeDefine;FuncCodeEnum">
-    <Exec Command="chcp 65001 &gt;NUL &amp;&amp; $(VcpkgRoot)\vcpkg.exe install --x-wait-for-lock --triplet &quot;$(VcpkgTriplet)&quot; --vcpkg-root &quot;$(VcpkgRoot)&quot; &quot;--x-manifest-root=$(VcpkgManifestDirectory.TrimEnd('\'))&quot; &quot;--x-install-root=$(VcpkgInstalledDir.TrimEnd('\'))&quot;" StdOutEncoding="UTF-8" StdErrEncoding="UTF-8" WorkingDirectory="$(MSBuildThisFileDirectory).." />
+    <Exec Command="chcp 65001 &gt;NUL &amp;&amp; vcpkg.exe install --x-wait-for-lock --triplet &quot;$(VcpkgTriplet)&quot; --vcpkg-root &quot;$(VcpkgRoot)&quot; &quot;--x-manifest-root=$(VcpkgManifestDirectory.TrimEnd('\'))&quot; &quot;--x-install-root=$(VcpkgInstalledDir.TrimEnd('\'))&quot;" StdOutEncoding="UTF-8" StdErrEncoding="UTF-8" WorkingDirectory="$(MSBuildThisFileDirectory).." />
   </Target>
   <Target Name="_WriteFuncCodeDefineRcTlogs"
       Condition="'@(FuncCodeRes)' != '' and '@(SelectedFiles)' == ''">