mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-14 19:03:02 +01:00
Fix some build issues
This commit is contained in:
parent
49f5efaab0
commit
6cc1525daa
@ -13,12 +13,14 @@ ifneq ($(AUDIO), disabled)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Check if we want build video support
|
# Check if we want build video support
|
||||||
VIDEO = $*shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
|
VIDEO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
|
||||||
|
ifneq ($(X11), disabled)
|
||||||
ifneq ($(AUDIO), disabled)
|
ifneq ($(AUDIO), disabled)
|
||||||
ifneq ($(VIDEO), disabled)
|
ifneq ($(VIDEO), disabled)
|
||||||
-include $(CHECKS_DIR)/video.mk
|
-include $(CHECKS_DIR)/video.mk
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# Check if we want build sound notifications support
|
# Check if we want build sound notifications support
|
||||||
SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
|
SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Variables for sound notifications support
|
# Variables for sound notifications support
|
||||||
SND_NOTIFY_LIBS = openal freealut
|
SND_NOTIFY_LIBS = openal freealut
|
||||||
SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
|
SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
|
||||||
ifneq (, $(findstring device.o, $(OBJ)))
|
ifneq (, $(findstring audio_device.o, $(OBJ)))
|
||||||
SND_NOTIFY_OBJ =
|
SND_NOTIFY_OBJ =
|
||||||
else
|
else
|
||||||
SND_NOTIFY_OBJ = device.o
|
SND_NOTIFY_OBJ = audio_device.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Check if we can build sound notifications support
|
# Check if we can build sound notifications support
|
||||||
|
@ -76,12 +76,9 @@ struct CallControl {
|
|||||||
uint32_t audio_sample_rate;
|
uint32_t audio_sample_rate;
|
||||||
uint8_t audio_channels;
|
uint8_t audio_channels;
|
||||||
|
|
||||||
#ifdef VIDEO
|
|
||||||
uint32_t video_bit_rate;
|
uint32_t video_bit_rate;
|
||||||
int32_t video_frame_duration;
|
int32_t video_frame_duration;
|
||||||
|
|
||||||
#endif /* VIDEO */
|
|
||||||
|
|
||||||
} CallControl;
|
} CallControl;
|
||||||
|
|
||||||
struct CallControl CallControl;
|
struct CallControl CallControl;
|
||||||
|
@ -52,6 +52,7 @@ FriendRequests FrndRequests;
|
|||||||
#ifdef VIDEO
|
#ifdef VIDEO
|
||||||
#define AC_NUM_GLOB_COMMANDS 21
|
#define AC_NUM_GLOB_COMMANDS 21
|
||||||
#elif AUDIO
|
#elif AUDIO
|
||||||
|
#define AC_NUM_GLOB_COMMANDS 19
|
||||||
#else
|
#else
|
||||||
#define AC_NUM_GLOB_COMMANDS 17
|
#define AC_NUM_GLOB_COMMANDS 17
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user