vcpkg.exeのパス修正

sakura-editor · Jun 18, 2024 · 24be3d3 · 24be3d3
1 parent c8af473
commit 24be3d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)' == ''">