Merge branch 'master' into 1.1RC

This commit is contained in:
Marc Di Luzio 2018-04-27 08:59:53 +01:00
commit 2b1030da0f

View File

@ -24,6 +24,9 @@ daemon_sources = [
'daemon_config.c', 'daemon_config.c',
] ]
gamemoded_includes = libgamemode_includes
gamemoded_includes += config_h_dir
executable( executable(
'gamemoded', 'gamemoded',
sources: daemon_sources, sources: daemon_sources,
@ -34,10 +37,7 @@ executable(
inih_dependency, inih_dependency,
libdl, libdl,
], ],
include_directories: [ include_directories: gamemoded_includes,
config_h_dir,
libgamemode_includes,
],
install: true, install: true,
) )