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

Fix: vcpkg compile (#141)

Browse source 
Prerun VS vcpkg and cache pkg in a correct way .
This commit is contained in:
Zero Fanker 2025-07-28 23:07:36 -04:00 • committed by GitHub
parent ff16eb14db
commit 6191e1f813
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,22 @@ jobs:
3rdParty/xcc/vcpkg_downloads
3rdParty/xcc/vcpkg_installed
C:/Users/runneradmin/AppData/Local/vcpkg
key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }}
key: ${{ runner.os }}-vcpkg-${{ hashFiles('3rdParty/xcc/vcpkg.json') }}
- name: Vcpkg install
run: |
cd 3rdParty/xcc
$env:VCPKG_DOWNLOADS = $PWD
$vcpkgPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg"
# rm "$vcpkgPath\.vcpkg-root"
& "$vcpkgPath\vcpkg" install `
--x-wait-for-lock `
--triplet "x64-windows" `
--vcpkg-root $vcpkgPath `
--x-manifest-root="$PWD\" `
--x-install-root="$PWD\vcpkg_installed\x64-windows\"
ls
ls vcpkg_installed/x64-windows
ls vcpkg_installed/x64-windows/include
- name: build-msvc
run: |
devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor

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

@ -34,11 +34,28 @@ jobs:
3rdParty/xcc/vcpkg_downloads
3rdParty/xcc/vcpkg_installed
C:/Users/runneradmin/AppData/Local/vcpkg
key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }}
key: ${{ runner.os }}-vcpkg-${{ hashFiles('3rdParty/xcc/vcpkg.json') }}
- name: Vcpkg install
run: |
cd 3rdParty/xcc
$env:VCPKG_DOWNLOADS = $PWD
$vcpkgPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg"
# rm "$vcpkgPath\.vcpkg-root"
& "$vcpkgPath\vcpkg" install `
--x-wait-for-lock `
--triplet "x64-windows" `
--vcpkg-root $vcpkgPath `
--x-manifest-root="$PWD\" `
--x-install-root="$PWD\vcpkg_installed\x64-windows\"
ls
ls vcpkg_installed/x64-windows
ls vcpkg_installed/x64-windows/include
- name: Build Main Program (MSVC)
run: |
devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor
- name: Build UT tool (MSVC)
env:
VCPKG_ENABLE_MANIFEST: "0"
run: |
devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project UnitTest
- name: Cache vcpkg
@ -48,7 +65,7 @@ jobs:
3rdParty/xcc/vcpkg_downloads
3rdParty/xcc/vcpkg_installed
C:/Users/runneradmin/AppData/Local/vcpkg
key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }}
key: ${{ runner.os }}-vcpkg-${{ hashFiles('3rdParty/xcc/vcpkg.json') }}
- name: do UT
run: |
cd x64\Debug

2
3rdParty/xcc/XCC.props vendored
View file

@ -11,7 +11,7 @@
<PreprocessorDefinitions>_HAS_STD_BYTE=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalManifestDependencies>"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
<AdditionalManifestDependencies>"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
<AdditionalDependencies>dsound.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

2
MissionEditor/PropertySheets/Debug.props
View file

@ -4,7 +4,7 @@
<Import Project="$(MSBuildThisFileDirectory)/Common.props" />
</ImportGroup>
<PropertyGroup>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDir>$(XccVcpkgDirTriplet)\debug</XccVcpkgDir>
<VxlLibDir>$(SolutionDir)$(Platform)\Debug</VxlLibDir>
<SchemaType>Debug</SchemaType>

2
MissionEditor/PropertySheets/Release.props
View file

@ -4,7 +4,7 @@
<Import Project="$(MSBuildThisFileDirectory)/Common.props" />
</ImportGroup>
<PropertyGroup>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDirTriplet>$(XccDir)\vcpkg_installed\$(Platform)-windows</XccVcpkgDirTriplet>
<XccVcpkgDir>$(XccVcpkgDirTriplet)</XccVcpkgDir>
<VxlLibDir>$(SolutionDir)$(Platform)\Release</VxlLibDir>
<SchemaType>Release</SchemaType>

4
UnitTest/UnitTest.vcxproj
View file

@ -112,7 +112,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(SolutionDir)googletest\x64\lib\$(Configuration)\*.lib;$(SolutionDir)3rdParty\xcc\vcpkg_installed\x64-windows\x64-windows\lib\*.lib;XCC Library.lib;MissionEditorPackLibd.lib</AdditionalDependencies>
<AdditionalDependencies>$(SolutionDir)googletest\x64\lib\$(Configuration)\*.lib;$(SolutionDir)3rdParty\xcc\vcpkg_installed\x64-windows\lib\*.lib;XCC Library.lib;MissionEditorPackLibd.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)build\output\$(Configuration)-$(Platform)\lib;$(SolutionDir)build\output\$(Configuration)Minimal-$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
@ -132,7 +132,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(SolutionDir)googletest\x64\lib\$(Configuration)\*.lib;$(SolutionDir)3rdParty\xcc\vcpkg_installed\x64-windows\x64-windows\lib\*.lib;XCC Library.lib;MissionEditorPackLib.lib</AdditionalDependencies>
<AdditionalDependencies>$(SolutionDir)googletest\x64\lib\$(Configuration)\*.lib;$(SolutionDir)3rdParty\xcc\vcpkg_installed\x64-windows\lib\*.lib;XCC Library.lib;MissionEditorPackLib.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)build\output\$(Configuration)-$(Platform)\lib;$(SolutionDir)build\output\$(Configuration)Minimal-$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>