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

script: Add beginnings of config + script system #1527

Merged
merged 2 commits into from
Oct 7, 2024
Merged

script: Add beginnings of config + script system #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b909892
script: Add beginnings of config + script system
misyltoad Sep 5, 2024
da83473
ci: Disable Clang CI for now
misyltoad Oct 7, 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
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
sdl2 vulkan-headers libx11 libxmu libxcomposite libxrender libxres \
libxtst libxkbcommon libdrm libinput wayland-protocols benchmark \
xorg-xwayland pipewire cmake \
libavif libheif aom rav1e libdecor libxdamage
libavif libheif aom rav1e libdecor libxdamage \
luajit
- uses: actions/checkout@v4
with:
submodules: recursive
Expand All @@ -32,8 +33,8 @@ jobs:
export CC=gcc CXX=g++
meson build-gcc-novr/ -Dinput_emulation=disabled -Denable_openvr_support=false --werror --auto-features=enabled
ninja -C build-gcc-novr/
- name: Build with clang
run: |
export CC=clang CXX=clang++
meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
ninja -C build-clang/
# - name: Build with clang
# run: |
# export CC=clang CXX=clang++
# meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
# ninja -C build-clang/
6 changes: 6 additions & 0 deletions default_scripts_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh

# Remove old Gamescope default configs and add our own.
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope"
rm -rf "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts" || true
cp -r "${MESON_SOURCE_ROOT}/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts"
4 changes: 4 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ add_project_arguments(cppc.get_supported_arguments([
]), language: 'cpp')

add_project_arguments(cppc.get_supported_arguments([
'-fno-exceptions',
'-ffast-math',
]), language: 'cpp')

Expand Down Expand Up @@ -94,3 +95,6 @@ endif
if get_option('enable_gamescope')
subdir('src')
endif

# Handle default script/config stuff
meson.add_install_script('default_scripts_install.sh')
Loading