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

Jump to bottom

Add libdecor support for SDL #170

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add libdecor support for SDL #170

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
59dba7f
Add libdecor
RushingAlien Aug 16, 2023
3e81ef0
add meson in linux build environment
RushingAlien Aug 16, 2023
6e552b0
add libpangocairo in linux build environment
RushingAlien Aug 16, 2023
c24fa9c
fix libpangocairo package name
RushingAlien Aug 16, 2023
e01c9e2
Add copying of libdecor
RushingAlien Aug 16, 2023
678b874
install pango dev package instead of desktop package
RushingAlien Aug 16, 2023
68cd44c
add sudo to meson install
RushingAlien Aug 16, 2023
d72e2a8
add build prefix, seperate system install and gh workflow install
RushingAlien Aug 17, 2023
3d79ae7
fix meson prefix path
RushingAlien Aug 17, 2023
90a50de
Simplify inclusion of libdecor
RushingAlien Aug 17, 2023
82b26a6
copy libdecor folder to native directory
RushingAlien Aug 17, 2023
6cb2c65
remove pwd in libdecor build process
RushingAlien Aug 17, 2023
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
15 changes: 14 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Expand Up @@ -45,6 +45,8 @@ jobs:
ninja-build \
wayland-scanner++ \
wayland-protocols \
meson \
libpango1.0-dev \
pkg-config${{ matrix.platform.target_apt_arch }} \
libasound2-dev${{ matrix.platform.target_apt_arch }} \
libdbus-1-dev${{ matrix.platform.target_apt_arch }} \
Expand Down Expand Up @@ -72,6 +74,14 @@ jobs:
libdrm-dev${{ matrix.platform.target_apt_arch }} \
libgbm-dev${{ matrix.platform.target_apt_arch }} \
libpulse-dev${{ matrix.platform.target_apt_arch }}
- name: Build libdecor
if: runner.os == 'Linux'
run: |
git clone https://gitlab.freedesktop.org/libdecor/libdecor.git
cd libdecor
git checkout 0.1.1
meson build -Ddemo=false -Dprefix=/usr
sudo meson install -C build
- uses: actions/checkout@v3
with:
repository: 'libsdl-org/SDL'
Expand Down Expand Up @@ -99,7 +109,10 @@ jobs:
run: cp install_output/bin/SDL2.dll SDL2-CS/native/${{ matrix.platform.name }}/SDL2.dll
if: runner.os == 'Windows'
- name: Prepare release (Linux)
run: cp install_output/lib/libSDL2-2.0.so.0 SDL2-CS/native/${{ matrix.platform.name }}/libSDL2.so
run: |
cp install_output/lib/libSDL2-2.0.so.0 SDL2-CS/native/${{ matrix.platform.name }}/libSDL2.so
cp /usr/lib/x86_64-linux-gnu/libdecor-0.so.0.100.1 SDL2-CS/native/${{ matrix.platform.name }}/libdecor-0.so
cp /usr/lib/x86_64-linux-gnu/libdecor SDL2-CS/native/${{ matrix.platform.name }}/libdecor
if: runner.os == 'Linux'
- name: Prepare release (macOS)
run: cp install_output/lib/libSDL2-2.0.dylib SDL2-CS/native/${{ matrix.platform.name }}/libSDL2.dylib
Expand Down