From abde6a01f87da91529b4472c9380e53ce19feca2 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 22 Apr 2016 14:55:55 -0500 Subject: [PATCH] bluetooth: Re-introduce to image * Previous enablement broke gcc2 and hybrid builds * gcc2 builds fixed and tested working now * Fix Hybrid builds via missing MultiArch Jam * Sorry for the noise, enjoy early Bluetooth support --- build/jam/BuildSetup | 1 + build/jam/images/definitions/regular | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index d13922a9a4..c79abdf121 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -606,6 +606,7 @@ HOST_BE_API_HEADERS = [ FDirName $(HAIKU_TOP) headers build os ] [ FDirName $(HAIKU_TOP) headers build os add-ons registrar ] [ FDirName $(HAIKU_TOP) headers build os app ] + [ FDirName $(HAIKU_TOP) headers build os bluetooth ] [ FDirName $(HAIKU_TOP) headers build os drivers ] [ FDirName $(HAIKU_TOP) headers build os kernel ] [ FDirName $(HAIKU_TOP) headers build os interface ] diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index d0672649bd..29ee910235 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -45,6 +45,7 @@ DESKBAR_DESKTOP_APPLETS += ; SYSTEM_PREFERENCES += [ FFilterByBuildFeatures + Bluetooth DataTranslations E-mail Media @@ -69,6 +70,7 @@ rule HaikuImageGetSystemLibs [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures libalm.so libbe.so libbsd.so libbnetapi.so + libbluetooth.so libdebug.so libdevice.so libgame.so libglut.so@mesa libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so @@ -95,7 +97,7 @@ rule HaikuImageGetPrivateSystemLibs SYSTEM_SERVERS += [ FFilterByBuildFeatures mail_daemon media_addon_server media_server midi_server - nfs4_idmapper_server + nfs4_idmapper_server bluetooth_server print_server print_addon_server ] ;