Merge r3745.

Originally committed to SVN as r3747.
This commit is contained in:
Amar Takhar 2009-10-28 00:41:23 +00:00
parent 370e02940d
commit b267327b67
2 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
noinst_LIBRARIES = libass_aegisub.a
AM_CPPFLAGS = -I../src @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
if BUILD_DARWIN
AM_CPPFLAGS += -DBUILD_DARWIN

0
aegisub/libass/config.h Normal file
View File