Skip to content
Snippets Groups Projects
Commit 6a55d53c authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/smcv/build' into 'master'

Build improvements

See merge request steam/pressure-vessel!42
parents d3530450 c48d788b
No related branches found
No related tags found
No related merge requests found
...@@ -127,6 +127,21 @@ endforeach ...@@ -127,6 +127,21 @@ endforeach
supported_warning_cflags = c_compiler.get_supported_arguments(project_warning_cflags) supported_warning_cflags = c_compiler.get_supported_arguments(project_warning_cflags)
add_project_arguments(supported_warning_cflags, language : 'c') add_project_arguments(supported_warning_cflags, language : 'c')
libglnx = subproject('libglnx')
steam_runtime_tools = dependency(
'steam-runtime-tools-0',
version : '>=0.20200331.1',
required : true,
fallback : ['steam-runtime-tools', 'libsteamrt_dep'],
default_options : [
'gtk_doc=false',
'man=false',
'installed_tests=false',
'introspection=false',
],
)
scripts = [ scripts = [
'pressure-vessel-locale-gen', 'pressure-vessel-locale-gen',
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
...@@ -217,7 +232,7 @@ executable( ...@@ -217,7 +232,7 @@ executable(
], ],
dependencies : [ dependencies : [
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install : true, install : true,
...@@ -255,16 +270,10 @@ executable( ...@@ -255,16 +270,10 @@ executable(
'-Wno-unused-local-typedefs', '-Wno-unused-local-typedefs',
], ],
dependencies : [ dependencies : [
dependency( steam_runtime_tools,
'steam-runtime-tools-0',
version : '>=0.20200331.1',
required : true,
fallback : ['steam-runtime-tools', 'libsteamrt_dep'],
default_options : ['gtk_doc=false'],
),
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
dependency('xau', required : true), dependency('xau', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install : true, install : true,
...@@ -299,7 +308,7 @@ executable( ...@@ -299,7 +308,7 @@ executable(
], ],
dependencies : [ dependencies : [
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install : false, install : false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment