From dc86b5b9eca73ddd8524a4744bd381fc4af890f7 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 11 Jun 2024 17:44:10 +0200 Subject: Keep install script behavior the same as before, dont use it if you want normal meson behavior --- .gitignore | 2 ++ debug-install.sh | 12 ------------ install.sh | 4 +++- meson.build | 4 ++-- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100755 debug-install.sh diff --git a/.gitignore b/.gitignore index 67d82b2..bc99e58 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ external/wlr-export-dmabuf-unstable-v1-protocol.c .cache/ .vscode/ +build/ + *.o gpu-screen-recorder gsr-kms-server diff --git a/debug-install.sh b/debug-install.sh deleted file mode 100755 index 02e96ac..0000000 --- a/debug-install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -script_dir=$(dirname "$0") -cd "$script_dir" - -[ $(id -u) -ne 0 ] && echo "You need root privileges to run the install script" && exit 1 - -test -d build || meson setup build -meson configure --buildtype=debug build -ninja -C build install - -echo "Successfully installed gpu-screen-recorder (debug)" diff --git a/install.sh b/install.sh index adbc663..8fa1595 100755 --- a/install.sh +++ b/install.sh @@ -5,8 +5,10 @@ cd "$script_dir" [ $(id -u) -ne 0 ] && echo "You need root privileges to run the install script" && exit 1 +echo "Warning: this install.sh script exists for backwards compatibility. Use meson directly instead if possible" + test -d build || meson setup build -meson configure --buildtype=release build +meson configure --prefix=/usr --buildtype=release -Dsystemd=true -Dstrip=true build ninja -C build install echo "Successfully installed gpu-screen-recorder" diff --git a/meson.build b/meson.build index 99bac8e..e7f467b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ -project('gpu-screen-recorder', ['c', 'cpp']) +project('gpu-screen-recorder', ['c', 'cpp'], version : '3.8.0', default_options : ['warning_level=2']) -add_project_arguments('-Wall', '-Wextra', '-Wshadow', language : ['c', 'cpp']) +add_project_arguments('-Wshadow', language : ['c', 'cpp']) if get_option('buildtype') == 'debug' add_project_arguments('-g3', language : ['c', 'cpp']) elif get_option('buildtype') == 'release' -- cgit v1.2.3