Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

warzone2100 - Use vcpkg for all packages #1250

Closed
wants to merge 3 commits into from
Closed

warzone2100 - Use vcpkg for all packages #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c34defc
warzone2100 - Use vcpkg for all packages
d10sfan Jun 19, 2024
62d6f52
Update lib.sh
d10sfan Jun 19, 2024
7d70228
Update build.sh
d10sfan Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ start_vcpkg () {
# clone repo and setup vcpkg
git clone https://github.com/Microsoft/vcpkg.git vcpkg
pushd vcpkg
git checkout -f 62aa449
git checkout -f 2024.06.15
echo 'set(VCPKG_BUILD_TYPE release)' >> triplets/community/x64-linux-dynamic.cmake # add release target to the triplet in use, so only release is being built
popd

Expand Down
1 change: 1 addition & 0 deletions engines/warzone2100/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ popd
# COPY PHASE
mkdir -p "$diststart/1241950/dist/data"
mkdir -p "$diststart/1241950/dist/bin"

cp -rfv "$pfx/share/locale" "$diststart/1241950/dist/"
cp -rfv "$pfx/share/warzone2100/"* "$diststart/1241950/dist/data"
cp -rfv "$pfx/bin/warzone2100" "$diststart/1241950/dist/bin"
Expand Down
5 changes: 1 addition & 4 deletions engines/warzone2100/env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
"./source/COPYING.NONGPL",
"./source/COPYING.README"
],
"LIBRARIES": [
"glslc"
],
"COMMIT_TAG": "4.4.2"
}
}
3 changes: 2 additions & 1 deletion engines/warzone2100/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"dependencies": [
"physfs",
"minizip",
"libsodium"
"libsodium",
"shaderc"
]
}
18 changes: 0 additions & 18 deletions libraries/glslc/build.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions libraries/glslc/env.sh
View file
Open in desktop

This file was deleted.

Loading