Merge r3361.

Originally committed to SVN as r3362.
This commit is contained in:
Amar Takhar 2009-08-05 04:04:30 +00:00
parent 424f84c3aa
commit d615fcb3ad
1 changed files with 1 additions and 1 deletions

View File

@ -18,7 +18,7 @@ SUBDIRS = \
$(libauto3) \ $(libauto3) \
$(libosxutil_subdir) $(libosxutil_subdir)
AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../libffms/include AM_CXXFLAGS = -DAEGISUB -Iinclude -I../libffms/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
bin_PROGRAMS = aegisub-2.1 bin_PROGRAMS = aegisub-2.1
aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib)