summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-03 22:18:21 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-03 22:18:21 +0000
commitab02002f0de5d5f823c51ac324fb969818c5d325 (patch)
tree339ff549f83531df0b2bdb200e4fdfcc2503a5ee /libmpdemux
parent693752585012f29da20dfeaea1142c037bae2022 (diff)
downloadmpv-ab02002f0de5d5f823c51ac324fb969818c5d325.tar.bz2
mpv-ab02002f0de5d5f823c51ac324fb969818c5d325.tar.xz
Forgotten part of the LIVE555 configure test simplification.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19309 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 8747ffedcc..3ee5cd1aaf 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -99,14 +99,13 @@ endif
ifeq ($(STREAMING_LIVE555),yes)
CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
-CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
endif
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC)
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
-CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
+CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS
CPLUSPLUS = $(CC)
.SUFFIXES: .c .cpp .o