Skip to content
Snippets Groups Projects
Unverified Commit 6ba2ce01 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

build: disable SHM if DBUS is not used

As libwrap is used by default, HAVE_SHM should only be true
if directrenderer is not used to avoid useless work

Change-Id: I9f819a7c06c667ccf08066f70104dcd3667f8546
parent 1c1a7f84
No related branches found
No related tags found
No related merge requests found
...@@ -79,8 +79,8 @@ ninja install ...@@ -79,8 +79,8 @@ ninja install
Done ! Done !
More details available here: Note:
https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions If you don't want SHM to be used, you can build with `--without-dbus`
How to compile on Linux for Android How to compile on Linux for Android
----------------------------------- -----------------------------------
......
...@@ -606,9 +606,11 @@ AC_DEFINE_UNQUOTED([HAVE_LIBNATPMP], ...@@ -606,9 +606,11 @@ AC_DEFINE_UNQUOTED([HAVE_LIBNATPMP],
[Define if you have libnatpmp]) [Define if you have libnatpmp])
AM_CONDITIONAL([BUILD_NATPMP], test "x$with_natpmp" = "xyes") AM_CONDITIONAL([BUILD_NATPMP], test "x$with_natpmp" = "xyes")
# SHM
dnl check for shm
AC_DEFINE_UNQUOTED([HAVE_SHM], AC_DEFINE_UNQUOTED([HAVE_SHM],
`if test -z "${HAVE_LINUX_TRUE}" && \ `if test "x$with_dbus" == xyes; then echo 1; else echo 0; fi`,
test -z "${HAVE_ANDROID_FALSE}"; then echo 1; else echo 0; fi`,
[Define if you have shared memory support]) [Define if you have shared memory support])
# DOXYGEN # DOXYGEN
......
...@@ -147,7 +147,7 @@ else ...@@ -147,7 +147,7 @@ else
endif endif
conf.set10('HAVE_COREAUDIO', host_machine.system() == 'darwin') conf.set10('HAVE_COREAUDIO', host_machine.system() == 'darwin')
conf.set10('HAVE_SHM', host_machine.system() == 'linux' and meson.get_compiler('cpp').get_define('__ANDROID__') != '1') conf.set10('HAVE_SHM', get_option('interfaces').contains('dbus'))
configure_file( configure_file(
output: 'config.h', output: 'config.h',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment