forked from mia/Aegisub
Move WITH_INTERNAL_LIBASS beove WITH_LIBASS for clarity.
Originally committed to SVN as r2101.
This commit is contained in:
parent
879db30e21
commit
5da0b16f48
1 changed files with 4 additions and 3 deletions
|
@ -12,9 +12,6 @@ aegisub_CPPFLAGS = @FREETYPE_CFLAGS@
|
||||||
aegisub_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@
|
aegisub_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@
|
||||||
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@
|
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@
|
||||||
|
|
||||||
if WITH_INTERNAL_LIBASS
|
|
||||||
aegisub_LDFLAGS += @FONTCONFIG_LIBS@
|
|
||||||
endif
|
|
||||||
|
|
||||||
#XXX: fix this so it's generated by configure and put into acconf.h
|
#XXX: fix this so it's generated by configure and put into acconf.h
|
||||||
#BUILDINFO := -DBUILD_CREDIT=verm -DBUILD_SVN_REVISION=0
|
#BUILDINFO := -DBUILD_CREDIT=verm -DBUILD_SVN_REVISION=0
|
||||||
|
@ -57,6 +54,10 @@ aegisub_LDFLAGS += @AVFORMAT_LDFLAGS@ @AVCODEC_LDFLAGS@ @SWSCALE_LDFLAGS@
|
||||||
aegisub_LDADD += libaudiovideo_ffmpeg.a
|
aegisub_LDADD += libaudiovideo_ffmpeg.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if WITH_INTERNAL_LIBASS
|
||||||
|
aegisub_LDFLAGS += @FONTCONFIG_LIBS@
|
||||||
|
endif
|
||||||
|
|
||||||
if HAVE_LIBASS
|
if HAVE_LIBASS
|
||||||
noinst_LIBRARIES += libsubtitle_ass.a
|
noinst_LIBRARIES += libsubtitle_ass.a
|
||||||
libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
|
libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
|
||||||
|
|
Loading…
Reference in a new issue