diff options
Diffstat (limited to 'lib/rbcodec/codecs/libopus')
-rw-r--r-- | lib/rbcodec/codecs/libopus/libopus.make | 6 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libopus/opus_config.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/libopus.make b/lib/rbcodec/codecs/libopus/libopus.make index ab93a5a5cc..5cfb34aac3 100644 --- a/lib/rbcodec/codecs/libopus/libopus.make +++ b/lib/rbcodec/codecs/libopus/libopus.make | |||
@@ -13,10 +13,12 @@ OPUSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libopus/SOURCES) | |||
13 | OPUSLIB_OBJ := $(call c2obj, $(OPUSLIB_SRC)) | 13 | OPUSLIB_OBJ := $(call c2obj, $(OPUSLIB_SRC)) |
14 | 14 | ||
15 | # codec specific compilation flags | 15 | # codec specific compilation flags |
16 | $(OPUSLIB) : CODECFLAGS += -DHAVE_CONFIG_H \ | 16 | # prepend paths to avoid name clash issues |
17 | $(OPUSLIB) : CODECFLAGS := -DHAVE_CONFIG_H \ | ||
17 | -I$(RBCODECLIB_DIR)/codecs/libopus \ | 18 | -I$(RBCODECLIB_DIR)/codecs/libopus \ |
18 | -I$(RBCODECLIB_DIR)/codecs/libopus/celt \ | 19 | -I$(RBCODECLIB_DIR)/codecs/libopus/celt \ |
19 | -I$(RBCODECLIB_DIR)/codecs/libopus/silk | 20 | -I$(RBCODECLIB_DIR)/codecs/libopus/silk \ |
21 | $(CODECFLAGS) | ||
20 | 22 | ||
21 | $(OPUSLIB): $(OPUSLIB_OBJ) | 23 | $(OPUSLIB): $(OPUSLIB_OBJ) |
22 | $(SILENT)$(shell rm -f $@) | 24 | $(SILENT)$(shell rm -f $@) |
diff --git a/lib/rbcodec/codecs/libopus/opus_config.h b/lib/rbcodec/codecs/libopus/opus_config.h index 922ec607e5..39abc8d8d4 100644 --- a/lib/rbcodec/codecs/libopus/opus_config.h +++ b/lib/rbcodec/codecs/libopus/opus_config.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef CONFIG_H | 1 | #ifndef CONFIG_H |
2 | #define CONFIG_H | 2 | #define CONFIG_H |
3 | 3 | ||
4 | #include "config.h" | 4 | #include "rbcodecconfig.h" |
5 | #include "codeclib.h" | 5 | #include "codeclib.h" |
6 | #include "ogg/ogg.h" | 6 | #include "ogg/ogg.h" |
7 | 7 | ||