ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lower meson version requirement to 0.45

This commit is contained in:
Emmanuel Gil Peyrot 2020-11-02 17:29:31 +01:00
parent cec553f4b9
commit cabb0eb327
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/frontend/posix/cli/meson.build
View File

@ -9,11 +9,11 @@ cli_src = [
]
# TODO: why do we have to redeclare it here with one more fs level?
includes = [
includes = include_directories(
'../../../../src',
'../../../../src/libretro-common/include',
'../../../../src/frontend',
]
)
executable('desmume-cli',
cli_src,
@ -23,4 +23,4 @@ executable('desmume-cli',
install: true,
)
install_data('doc/desmume-cli.1', install_dir: get_option('datadir') / 'man' / 'man1')
install_data('doc/desmume-cli.1', install_dir: join_paths(get_option('datadir'), 'man', 'man1'))

12
desmume/src/frontend/posix/gtk-glade/meson.build
View File

@ -25,11 +25,11 @@ desmume_src = [
]
# TODO: why do we have to redeclare it here with one more fs level?
includes = [
includes = include_directories(
'../../../../src',
'../../../../src/libretro-common/include',
'../../../../src/frontend',
]
)
executable('desmume-glade',
desmume_src,
@ -40,7 +40,7 @@ executable('desmume-glade',
install: true,
)
install_data('desmume-glade.desktop', install_dir: get_option('datadir') / 'applications')
install_data('glade/DeSmuME.xpm', install_dir: get_option('datadir') / 'pixmaps')
install_data('doc/desmume-glade.1', install_dir: get_option('datadir') / 'man' / 'man1')
install_data(['glade/DeSmuMe_Dtools.glade', 'glade/DeSmuMe.glade', 'glade/DeSmuME.xpm'], install_dir: get_option('datadir') / 'glade')
install_data('desmume-glade.desktop', install_dir: join_paths(get_option('datadir'), 'applications'))
install_data('glade/DeSmuME.xpm', install_dir: join_paths(get_option('datadir'), 'pixmaps'))
install_data('doc/desmume-glade.1', install_dir: join_paths(get_option('datadir'), 'man', 'man1'))
install_data(['glade/DeSmuMe_Dtools.glade', 'glade/DeSmuMe.glade', 'glade/DeSmuME.xpm'], install_dir: join_paths(get_option('datadir'), 'glade'))

10
desmume/src/frontend/posix/gtk/meson.build
View File

@ -20,11 +20,11 @@ desmume_src = [
]
# TODO: why do we have to redeclare it here with one more fs level?
includes = [
includes = include_directories(
'../../../../src',
'../../../../src/libretro-common/include',
'../../../../src/frontend',
]
)
executable('desmume',
desmume_src,
@ -35,6 +35,6 @@ executable('desmume',
install: true,
)
install_data('desmume.desktop', install_dir: get_option('datadir') / 'applications')
install_data('DeSmuME.svg', install_dir: get_option('datadir') / 'pixmaps')
install_data('doc/desmume.1', install_dir: get_option('datadir') / 'man' / 'man1')
install_data('desmume.desktop', install_dir: join_paths(get_option('datadir'), 'applications'))
install_data('DeSmuME.svg', install_dir: join_paths(get_option('datadir'), 'pixmaps'))
install_data('doc/desmume.1', install_dir: join_paths(get_option('datadir'), 'man', 'man1'))

8
desmume/src/frontend/posix/meson.build
View File

@ -1,9 +1,9 @@
project('desmume',
['c', 'cpp'],
version: '2.7.10',
meson_version: '>=0.53',
meson_version: '>=0.45',
default_options: [
'warning_level=0',
'warning_level=1',
'c_std=c11',
'cpp_std=c++14',
],
@ -42,11 +42,11 @@ else
have_jit = false
endif
includes = [
includes = include_directories(
'../../../src',
'../../../src/libretro-common/include',
'../../../src/frontend',
]
)
libdesmume_src = [
'../../armcpu.cpp',