King_DuckZ/orotool
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

Remove config_file option

Browse source
This commit is contained in:
King_DuckZ 2020-08-10 12:44:54 +01:00
parent 2a4fe62427
commit c05213d576
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson_options.txt
View file

@ -1,3 +1,2 @@
option('base_url', type: 'string', value: 'https://api.originsro.org') option('base_url', type: 'string', value: 'https://api.originsro.org')
option('database_file', type: 'string', value: 'originsro.db3') option('database_file', type: 'string', value: 'originsro.db3')
option('config_file', type: 'string', value: 'orotool.conf')

2
src/meson.build
View file

@ -22,7 +22,7 @@ endif
conf = configuration_data() conf = configuration_data()
conf.set_quoted('BASE_URL', base_url) conf.set_quoted('BASE_URL', base_url)
conf.set_quoted('DATABASE', get_option('database_file')) conf.set_quoted('DATABASE', get_option('database_file'))
conf.set_quoted('CONFIG_FILE_PATH', get_option('prefix') / get_option('sysconfdir') / get_option('config_file')) conf.set_quoted('CONFIG_FILE_PATH', get_option('prefix') / get_option('sysconfdir') / meson.project_name() + '.conf')
project_config_file = configure_file( project_config_file = configure_file(
input: 'config.hpp.in', input: 'config.hpp.in',
output: meson.project_name() + '_config.hpp', output: meson.project_name() + '_config.hpp',