wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1073548: Support Bluetooth daemon in build system, r=mh+mozilla

Browse Source
This commit is contained in:
Thomas Zimmermann 2014-11-03 13:03:48 +01:00
parent 94b2f27ae8
commit 2a5770563c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -258,6 +258,9 @@ if test -n "$gonkdir" ; then
elif test -d "$gonkdir/external/bluetooth/bluedroid"; then elif test -d "$gonkdir/external/bluetooth/bluedroid"; then
MOZ_B2G_BT=1 MOZ_B2G_BT=1
MOZ_B2G_BT_BLUEDROID=1 MOZ_B2G_BT_BLUEDROID=1
if test -d "$gonkdir/system/bluetoothd"; then
MOZ_B2G_BT_DAEMON=1
fi
fi fi
MOZ_RTSP=1 MOZ_RTSP=1
@ -275,6 +278,9 @@ if test -n "$gonkdir" ; then
MOZ_B2G_CAMERA=1 MOZ_B2G_CAMERA=1
MOZ_B2G_BT=1 MOZ_B2G_BT=1
MOZ_B2G_BT_BLUEDROID=1 MOZ_B2G_BT_BLUEDROID=1
if test -d "$gonkdir/system/bluetoothd"; then
MOZ_B2G_BT_DAEMON=1
fi
MOZ_NFC=1 MOZ_NFC=1
MOZ_RTSP=1 MOZ_RTSP=1
MOZ_OMX_DECODER=1 MOZ_OMX_DECODER=1

2
dom/bluetooth/moz.build
View File

@ -78,6 +78,8 @@ if CONFIG['MOZ_B2G_BT']:
] ]
DEFINES['MOZ_B2G_BT_BLUEDROID'] = True DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
if CONFIG['MOZ_B2G_BT_DAEMON']:
DEFINES['MOZ_B2G_BT_DAEMON'] = True
elif CONFIG['MOZ_ENABLE_DBUS']: elif CONFIG['MOZ_ENABLE_DBUS']:
CFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']