tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-09-06 14:25:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rollback XccVcpkgDir duplicated path for dev / CI compatibility .

Browse source
This commit is contained in:
Zero Fanker 2025-08-01 10:37:28 -04:00
parent 9e08f380f5
commit d6317ff86b
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/release.yml vendored
View file

@ -66,9 +66,10 @@ jobs:
--triplet "x64-windows" `
--vcpkg-root $vcpkgPath `
--x-manifest-root="$PWD\" `
--x-install-root="$PWD\vcpkg_installed\"
--x-install-root="$PWD\vcpkg_installed\x64-windows"
ls
ls vcpkg_installed/x64-windows
ls vcpkg_installed/x64-windows/x64-windows
- name: build-msvc
run: |
devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor

6
.github/workflows/verify.yml vendored
View file

@ -51,10 +51,10 @@ jobs:
--triplet "x64-windows" `
--vcpkg-root $vcpkgPath `
--x-manifest-root="$PWD\" `
--x-install-root="$PWD\vcpkg_installed\"
--x-install-root="$PWD\vcpkg_installed\x64-windows"
ls
ls vcpkg_installed/x64-windows
ls vcpkg_installed/x64-windows/include
ls vcpkg_installed/x64-windows/x64-windows
ls vcpkg_installed/x64-windows/x64-windows/include
- name: Build Main Program (MSVC)
run: |
devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor

2
MissionEditor/PropertySheets/Common.props
View file

@ -7,7 +7,7 @@
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
</PropertyGroup>
<PropertyGroup>
<XccDir>$(MSBuildThisFileDirectory)..\..\3rdParty\xcc</XccDir>
<XccDir>$(SolutionDir)\3rdParty\xcc</XccDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>

3
MissionEditor/PropertySheets/Debug.props
View file

@ -4,7 +4,8 @@
<Import Project="$(MSBuildThisFileDirectory)/Common.props" />
</ImportGroup>
<PropertyGroup>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows</XccVcpkgDirTriplet>
<!-- Why duplicated 'x64-windows' ? Because it is how vcpkg automatically does, shitty -->
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDir>$(XccVcpkgDirTriplet)\debug</XccVcpkgDir>
<VxlLibDir>$(SolutionDir)$(Platform)\Debug</VxlLibDir>
<SchemaType>Debug</SchemaType>

3
MissionEditor/PropertySheets/Release.props
View file

@ -4,7 +4,8 @@
<Import Project="$(MSBuildThisFileDirectory)/Common.props" />
</ImportGroup>
<PropertyGroup>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows</XccVcpkgDirTriplet>
<!-- Why duplicated 'x64-windows' ? Because it is how vcpkg automatically does, shitty -->
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDir>$(XccVcpkgDirTriplet)</XccVcpkgDir>
<VxlLibDir>$(SolutionDir)$(Platform)\Release</VxlLibDir>
<SchemaType>Release</SchemaType>