From 16a82e1897cdd304d43b3b0c4a6e33ccef45400a Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Sun, 6 Jul 2014 19:57:08 +0200 Subject: [PATCH 1/2] Add option to disable audio support --- build/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index 4d98173..0014392 100644 --- a/build/Makefile +++ b/build/Makefile @@ -54,7 +54,8 @@ ifneq ($(filter arm%, $(UNAME_M)),) -include $(CFG_DIR)/arm.mk endif -# Check if we can build audio +# Check if we want/can build audio +ifneq ($(DISABLE_AV), 1) CHECK_AUDIO_LIBS = $(shell pkg-config $(AUDIO_LIBS) || echo -n "error") ifneq ($(CHECK_AUDIO_LIBS), error) LIBS += $(AUDIO_LIBS) @@ -68,6 +69,7 @@ $(warning WARNING -- You need these libraries for audio support) $(warning WARNING -- $(MISSING_AUDIO_LIBS)) endif endif +endif # Check if we can build Toxic CHECK_LIBS = $(shell pkg-config $(LIBS) || echo -n "error") From 612c0e1131d6cd9063ceb3988b9474867521cc47 Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Sun, 6 Jul 2014 21:23:58 +0200 Subject: [PATCH 2/2] Add freebsd flags for ncursesw --- README.md | 1 + build/Makefile | 3 +++ cfg/FreeBSD.mk | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 cfg/FreeBSD.mk diff --git a/README.md b/README.md index 87026e3..39485dd 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Toxic is a [Tox](https://tox.im)-based instant messenging client which formerly * You can add specific flags to the Makefile with `USER_CFLAGS=""` and/or `USER_LDFLAGS=""` * You can pass your own flags to the Makefile with `CFLAGS=""` and/or `LDFLAGS=""` (this will supersede the default ones) * Audio call support is automatically enabled if all dependencies are found +* If you want to build toxic without audio call support, you can use `make DISABLE_AV=1` ### Packaging * For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files diff --git a/build/Makefile b/build/Makefile index 0014392..ecf0777 100644 --- a/build/Makefile +++ b/build/Makefile @@ -35,6 +35,9 @@ UNAME_S = $(shell uname -s) ifeq ($(UNAME_S), Linux) -include $(CFG_DIR)/Linux.mk endif +ifeq ($(UNAME_S), FreeBSD) + -include $(CFG_DIR)/FreeBSD.mk +endif ifeq ($(UNAME_S), Darwin) -include $(CFG_DIR)/Darwin.mk endif diff --git a/cfg/FreeBSD.mk b/cfg/FreeBSD.mk new file mode 100644 index 0000000..a4c1e43 --- /dev/null +++ b/cfg/FreeBSD.mk @@ -0,0 +1,3 @@ +# Specials options for freebsd systems +LIBS := $(filter-out ncursesw, $(LIBS)) +LDFLAGS += -lncursesw