Skip to content

Commit

Permalink
Replace meson join_paths() by '/'
Browse files Browse the repository at this point in the history
  • Loading branch information
rom1v committed Dec 12, 2024
1 parent f751274 commit 17e205e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions app/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -192,19 +192,19 @@ datadir = get_option('datadir') # by default 'share'
install_man('scrcpy.1')
install_data('data/icon.png',
rename: 'scrcpy.png',
install_dir: join_paths(datadir, 'icons/hicolor/256x256/apps'))
install_dir: datadir / 'icons/hicolor/256x256/apps')
install_data('data/zsh-completion/_scrcpy',
install_dir: join_paths(datadir, 'zsh/site-functions'))
install_dir: datadir / 'zsh/site-functions')
install_data('data/bash-completion/scrcpy',
install_dir: join_paths(datadir, 'bash-completion/completions'))
install_dir: datadir / 'bash-completion/completions')

# Desktop entry file for application launchers
if host_machine.system() == 'linux'
# Install a launcher (ex: /usr/local/share/applications/scrcpy.desktop)
install_data('data/scrcpy.desktop',
install_dir: join_paths(datadir, 'applications'))
install_dir: datadir / 'applications')
install_data('data/scrcpy-console.desktop',
install_dir: join_paths(datadir, 'applications'))
install_dir: datadir / 'applications')
endif


Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('scrcpy', 'c',
version: '3.1',
meson_version: '>= 0.48',
meson_version: '>= 0.49',
default_options: [
'c_std=c11',
'warning_level=2',
Expand Down

0 comments on commit 17e205e

Please sign in to comment.