s/WITH_/HAVE_ in src/Makefile so that libass and ffms are actually used when present

Originally committed to SVN as r5482.
This commit is contained in:
Thomas Goyne 2011-07-16 03:52:30 +00:00
parent 8ccc0acc9d
commit b509cb0be5

View file

@ -55,7 +55,7 @@ endif
####################### #######################
# AUDIO / VIDEO SUPPORT # AUDIO / VIDEO SUPPORT
####################### #######################
ifeq (yes, $(WITH_FFMS)) ifeq (yes, $(HAVE_FFMS))
SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \ audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \
CXXFLAGS += $(CFLAGS_FFMS) CXXFLAGS += $(CFLAGS_FFMS)
@ -68,7 +68,7 @@ endif
########### ###########
# SUBTITLES # SUBTITLES
########### ###########
ifeq (yes, $(WITH_LIBASS)) ifeq (yes, $(HAVE_LIBASS))
SRC_OPT += subtitles_provider_libass.cpp SRC_OPT += subtitles_provider_libass.cpp
subtitles_provider_libass.o: CXXFLAGS += $(CFLAGS_LIBASS) subtitles_provider_libass.o: CXXFLAGS += $(CFLAGS_LIBASS)
LDFLAGS += $(LDFLAGS_LIBASS) LDFLAGS += $(LDFLAGS_LIBASS)