mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add support for removing ffms support and properly link ffms into libaegisub.

Browse source 
Originally committed to SVN as r5283.
This commit is contained in:
Amar Takhar 2011-02-03 18:08:41 +00:00
parent e46f83e672
commit d59e0dd075
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aegisub/libaegisub/Makefile
View file

@ -17,9 +17,19 @@ LDFLAGS += -L../universalchardet -luniversalchardet
endif endif
common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV) common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
#######################
# AUDIO / VIDEO SUPPORT
#######################
ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE))
SRC_OPT += media/ffms_audio.cpp media/ffms_common.cpp media/ffms_video.cpp
common/ffms.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC) common/ffms.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
common/ffms_audio.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC) common/ffms_audio.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
common/ffms_video.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC) common/ffms_video.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
#LDFLAGS += $(LDFLAGS_FFMPEGSOURCE) $(LDFLAGS_LIBAVFORMAT) $(LDFLAGS_LIBAVCODEC) $(LDFLAGS_LIBSWSCALE) $(LDFLAGS_LIBAVUTIL) $(LDFLAGS_LIBPOSTPROC)
LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE)
endif
SRC = \ SRC = \
common/charset.cpp \ common/charset.cpp \
@ -34,14 +44,12 @@ SRC = \
common/log.cpp \ common/log.cpp \
common/validator.cpp \ common/validator.cpp \
common/vfr.cpp \ common/vfr.cpp \
media/ffms_audio.cpp \
media/ffms_common.cpp \
media/ffms_video.cpp \
media/video_frame.cpp \ media/video_frame.cpp \
unix/util.cpp \ unix/util.cpp \
unix/io.cpp \ unix/io.cpp \
unix/access.cpp \ unix/access.cpp \
unix/log.cpp unix/log.cpp \
$(SRC_OPT)
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
SRC += \ SRC += \