Skip to content

Commit 4c75562

Browse files
committed
update both places
1 parent 8df0b0a commit 4c75562

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

loader/CelesteLoader.csproj

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<EmccEnvironment>web,worker</EmccEnvironment>
3939

4040
<WasmCachePath>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\cache\</WasmCachePath>
41+
42+
<__CelesteWasmEmscriptenSdkToolsPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\</__CelesteWasmEmscriptenSdkToolsPath>
43+
<__CelesteWasmEmscriptenUpstreamBinPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\bin\</__CelesteWasmEmscriptenUpstreamBinPath>
44+
<__CelesteWasmEmscriptenUpstreamEmscriptenPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\</__CelesteWasmEmscriptenUpstreamEmscriptenPath>
45+
<__CelesteWasmEmscriptenNodeToolsPath>$(MSBuildProjectDirectory)\..\emsdk\node\22.16.0_64bit\bin\node</__CelesteWasmEmscriptenNodeToolsPath>
46+
<__CelesteWasmWasmClang>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\emcc</__CelesteWasmWasmClang>
4147
</PropertyGroup>
4248

4349
<ItemGroup>
@@ -110,11 +116,11 @@
110116
<!-- do not touch unless you like debugging -->
111117
<Target Name="ChangeClang" DependsOnTargets="_InitializeCommonProperties" BeforeTargets="_SetupEmscripten">
112118
<PropertyGroup>
113-
<EmscriptenSdkToolsPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\</EmscriptenSdkToolsPath>
114-
<EmscriptenUpstreamBinPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\bin\</EmscriptenUpstreamBinPath>
115-
<EmscriptenUpstreamEmscriptenPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\</EmscriptenUpstreamEmscriptenPath>
116-
<EmscriptenNodeToolsPath>$(MSBuildProjectDirectory)\..\emsdk\node\22.16.0_64bit\bin\node</EmscriptenNodeToolsPath>
117-
<WasmClang>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\emcc</WasmClang>
119+
<EmscriptenSdkToolsPath>$(__CelesteWasmEmscriptenSdkToolsPath)</EmscriptenSdkToolsPath>
120+
<EmscriptenUpstreamBinPath>$(__CelesteWasmEmscriptenUpstreamBinPath)</EmscriptenUpstreamBinPath>
121+
<EmscriptenUpstreamEmscriptenPath>$(__CelesteWasmEmscriptenUpstreamEmscriptenPath)</EmscriptenUpstreamEmscriptenPath>
122+
<EmscriptenNodeToolsPath>$(__CelesteWasmEmscriptenNodeToolsPath)</EmscriptenNodeToolsPath>
123+
<WasmClang>$(__CelesteWasmWasmClang)</WasmClang>
118124
</PropertyGroup>
119125
<ItemGroup>
120126
<EmscriptenPrependPATH Remove="/usr/share/dotnet/packs/*" />
@@ -127,11 +133,11 @@
127133

128134
<Target Name="ChangeClang2" DependsOnTargets="_GenerateManagedToNative" BeforeTargets="_WasmCompileNativeSourceFiles">
129135
<PropertyGroup>
130-
<EmscriptenSdkToolsPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\</EmscriptenSdkToolsPath>
131-
<EmscriptenUpstreamBinPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\bin\</EmscriptenUpstreamBinPath>
132-
<EmscriptenUpstreamEmscriptenPath>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\</EmscriptenUpstreamEmscriptenPath>
133-
<EmscriptenNodeToolsPath>$(MSBuildProjectDirectory)\..\emsdk\node\20.18.0_64bit\bin\node</EmscriptenNodeToolsPath>
134-
<WasmClang>$(MSBuildProjectDirectory)\..\emsdk\upstream\emscripten\emcc</WasmClang>
136+
<EmscriptenSdkToolsPath>$(__CelesteWasmEmscriptenSdkToolsPath)</EmscriptenSdkToolsPath>
137+
<EmscriptenUpstreamBinPath>$(__CelesteWasmEmscriptenUpstreamBinPath)</EmscriptenUpstreamBinPath>
138+
<EmscriptenUpstreamEmscriptenPath>$(__CelesteWasmEmscriptenUpstreamEmscriptenPath)</EmscriptenUpstreamEmscriptenPath>
139+
<EmscriptenNodeToolsPath>$(__CelesteWasmEmscriptenNodeToolsPath)</EmscriptenNodeToolsPath>
140+
<WasmClang>$(__CelesteWasmWasmClang)</WasmClang>
135141
</PropertyGroup>
136142
<ItemGroup>
137143
<EmscriptenPrependPATH Remove="/usr/share/dotnet/packs/*" />

0 commit comments

Comments
 (0)