mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev' into d3d12

Browse source
This commit is contained in:
Xu 2026-03-12 19:00:03 +08:00
commit d941b9af87
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/_ConanDeps/_ConanDeps.vcxproj
View file

@ -65,7 +65,8 @@ ConanFile = conanFiles.ToArray();
<PropertyGroup>
<BuildOptions Condition="$(UseClangCL)">ClangCL</BuildOptions>
<BuildOptions Condition="$(UseClangCL) And $(UseNativeMicroArch)">$(BuildOptions);UseNativeMicroArch</BuildOptions>
<BuildOptions Condition="!$(UseClangCL)">MSVC</BuildOptions>
<BuildOptions Condition="!$(UseClangCL)">$(BuildOptions);MSVC</BuildOptions>
<BuildOptions Condition="!$(UseClangCL)">$(BuildOptions);$(MSBuildVersion)</BuildOptions>
<LastBuildOptionsFile>$(IntDir)\\last_build_options.txt</LastBuildOptionsFile>
</PropertyGroup>
<ReadLinesFromFile File="$(LastBuildOptionsFile)">