1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 08:23:02 +01:00

Merge pull request #179 from Ansa89/master

Add option to disable audio support
This commit is contained in:
JFreegman 2014-07-06 16:16:15 -04:00
commit a784fdf9d5
3 changed files with 10 additions and 1 deletions

View File

@ -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 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) * 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 * 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 ### Packaging
* For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files * For packaging purpose, you can use `DESTDIR=""` to specify a directory where to store installed files

View File

@ -35,6 +35,9 @@ UNAME_S = $(shell uname -s)
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)
-include $(CFG_DIR)/Linux.mk -include $(CFG_DIR)/Linux.mk
endif endif
ifeq ($(UNAME_S), FreeBSD)
-include $(CFG_DIR)/FreeBSD.mk
endif
ifeq ($(UNAME_S), Darwin) ifeq ($(UNAME_S), Darwin)
-include $(CFG_DIR)/Darwin.mk -include $(CFG_DIR)/Darwin.mk
endif endif
@ -54,7 +57,8 @@ ifneq ($(filter arm%, $(UNAME_M)),)
-include $(CFG_DIR)/arm.mk -include $(CFG_DIR)/arm.mk
endif 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") CHECK_AUDIO_LIBS = $(shell pkg-config $(AUDIO_LIBS) || echo -n "error")
ifneq ($(CHECK_AUDIO_LIBS), error) ifneq ($(CHECK_AUDIO_LIBS), error)
LIBS += $(AUDIO_LIBS) LIBS += $(AUDIO_LIBS)
@ -68,6 +72,7 @@ $(warning WARNING -- You need these libraries for audio support)
$(warning WARNING -- $(MISSING_AUDIO_LIBS)) $(warning WARNING -- $(MISSING_AUDIO_LIBS))
endif endif
endif endif
endif
# Check if we can build Toxic # Check if we can build Toxic
CHECK_LIBS = $(shell pkg-config $(LIBS) || echo -n "error") CHECK_LIBS = $(shell pkg-config $(LIBS) || echo -n "error")

3
cfg/FreeBSD.mk Normal file
View File

@ -0,0 +1,3 @@
# Specials options for freebsd systems
LIBS := $(filter-out ncursesw, $(LIBS))
LDFLAGS += -lncursesw