mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Actually compile ffms and libass providers when they're enabled

Browse source 
Originally committed to SVN as r5838.
This commit is contained in:
Thomas Goyne 2011-11-08 06:06:43 +00:00
parent c763026bfc
commit 4bd34ee32f
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/configure.in
View file

@ -681,6 +681,9 @@ AC_ARG_WITH(ffms,[ --without-ffms build without ffms2 A/V provider. (d
if test "$with_ffms" != "no"; then if test "$with_ffms" != "no"; then
PKG_CHECK_MODULES(FFMS, ffms2 >= ffms_required_version, [with_ffms="yes"], [with_ffms="no"]) PKG_CHECK_MODULES(FFMS, ffms2 >= ffms_required_version, [with_ffms="yes"], [with_ffms="no"])
fi fi
if test "$with_ffms" != "no"; then
AC_DEFINE(WITH_FFMPEGSOURCE, 1, [Enable FFMS2 support])
fi
AC_SUBST(with_ffms) AC_SUBST(with_ffms)
@ -692,6 +695,9 @@ AC_ARG_WITH(libass,[ --without-libass build without libass support (defa
if test "$with_libass" != "no"; then if test "$with_libass" != "no"; then
PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version, [with_libass="yes"], [with_libass="no"]) PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version, [with_libass="yes"], [with_libass="no"])
fi fi
if test "$with_libass" != "no"; then
AC_DEFINE(WITH_LIBASS, 1, [Enable libass support])
fi
AC_SUBST(with_libass) AC_SUBST(with_libass)

4
aegisub/src/Makefile
View file

@ -60,8 +60,8 @@ SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpe
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)
ffmpegsource_common.o: CXXFLAGS += -D__STDC_FORMAT_MACROS ffmpegsource_common.o: CXXFLAGS += -D__STDC_FORMAT_MACROS
LDFLAGS += $(LDFLAGS_FFMPEGSOURCE) LDFLAGS += $(LDFLAGS_FFMS)
LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE) LDFLAGS_POST += $(LDFLAGS_FFMS)
endif endif