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.

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

Add Wayland binaries #11

Merged
merged 2 commits into from
Jul 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install X11 dependencies
run: |
sudo apt-get update
sudo apt-get install xorg-dev
sudo apt-get install xorg-dev libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules
- uses: actions/checkout@v3
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
Expand Down
26 changes: 21 additions & 5 deletions download_dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,34 @@ if (Test-Path tmp/src) {
}
Rename-Item -Path tmp/glfw-$GLFW_VERSION -NewName src

mkdir tmp/src/build
pushd tmp/src/build
cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON ..
mkdir tmp/src/build-x11
pushd tmp/src/build-x11
cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON ..

if ($LastExitCode -ne 0) {
throw 'GLFW compilation setup failed'
throw 'GLFW X11 compilation setup failed'
}

make -j

if ($LastExitCode -ne 0) {
throw 'GLFW compilation failed'
throw 'GLFW X11 compilation failed'
}

popd

mkdir tmp/src/build-wayland
pushd tmp/src/build-wayland
cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DGLFW_USE_WAYLAND=ON ..

if ($LastExitCode -ne 0) {
throw 'GLFW Wayland compilation setup failed'
}

make -j

if ($LastExitCode -ne 0) {
throw 'GLFW Wayland compilation failed'
}

popd
7 changes: 6 additions & 1 deletion glfw-redist.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,16 @@
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="tmp/src/build/src/*.so.$(GLFW_SHORT_VERSION)">
<Content Include="tmp/src/build-x11/src/*.so.$(GLFW_SHORT_VERSION)">
<PackagePath>runtimes/linux-x64/native/</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="tmp/src/build-wayland/src/*.so.$(GLFW_SHORT_VERSION)">
<PackagePath>runtimes/linux-x64/native/wayland/</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

<Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN32/LICENSE.md">
<PackagePath>COPYING.md</PackagePath>
Expand Down