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

Build changes for the new ffms, TheFluff will be comitting the aegisub changes shortly.

Browse source 
Originally committed to SVN as r3117.
This commit is contained in:
Amar Takhar 2009-07-13 22:30:49 +00:00
parent a45282bfbb
commit 5ad6e777d3
4 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/Makefile.am
View file

@ -10,7 +10,7 @@ libass = libass
endif endif
if HAVE_PROVIDER_FFMPEGSOURCE if HAVE_PROVIDER_FFMPEGSOURCE
ffmpegsource = FFmpegSource2 ffmpegsource = libffms
endif endif
SUBDIRS = \ SUBDIRS = \

4
aegisub/configure.in
View file

@ -41,7 +41,7 @@ AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([acconf.h]) AC_CONFIG_HEADER([acconf.h])
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_PROG_CC_C_O
########################### ###########################
# Check target architecture # Check target architecture
@ -1288,7 +1288,7 @@ src/libresrc/Makefile
src/libauto3/Makefile src/libauto3/Makefile
src/libosxutil/Makefile src/libosxutil/Makefile
universalchardet/Makefile universalchardet/Makefile
FFmpegSource2/Makefile libffms/Makefile
libass/Makefile libass/Makefile
automation/Makefile automation/Makefile
po/Makefile.in po/Makefile.in

52
aegisub/libffms/Makefile.am
View file

@ -1,32 +1,28 @@
noinst_LIBRARIES = libffmpegsource2_aegisub.a AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I../src -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ noinst_LIBRARIES = libffmpegsource_aegisub.a
AM_CPPFLAGS = -I../src -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
libffmpegsource2_aegisub_a_SOURCES = \ libffmpegsource_aegisub_a_SOURCES = \
ffaudiosource.cpp \ src/core/ffaudiosource.cpp \
ffms.cpp \ src/core/ffhaaliaudio.cpp \
ffvideosource.cpp \ src/core/ffhaaliindexer.cpp \
indexing.cpp \ src/core/ffhaalivideo.cpp \
MatroskaParser.c \ src/core/fflavfaudio.cpp \
stdiostream.c \ src/core/fflavfindexer.cpp \
utils.cpp \ src/core/fflavfvideo.cpp \
wave64writer.cpp src/core/ffmatroskaaudio.cpp \
src/core/ffmatroskaindexer.cpp \
src/core/ffmatroskavideo.cpp \
src/core/ffms.cpp \
src/core/ffvideosource.cpp \
src/core/indexing.cpp \
src/core/matroskaparser.c \
src/core/stdiostream.c \
src/core/utils.cpp \
src/core/wave64writer.cpp
libffmpegsource_aegisub_a_SOURCES += \
libffmpegsource2_aegisub_a_SOURCES += \ core/*.h
MatroskaParser.h \
avisynth.h \
ffaudiosource.h \
ffavisynth.h \
ffms.h \
ffpp.h \
ffswscale.h \
ffvideosource.h \
indexing.h \
stdiostream.h \
utils.h \
wave64writer.h
EXTRA_DIST = \
ffms2.html

4
aegisub/src/Makefile.am
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../FFmpegSource2 AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../libffms/include
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)
@ -81,7 +81,7 @@ if HAVE_PROVIDER_FFMPEGSOURCE
noinst_LIBRARIES += libaudiovideo_ffmpegsource.a noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../FFmpegSource2/libffmpegsource2_aegisub.a aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a
aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@ aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@
endif endif