mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3.

Browse source 
Originally committed to SVN as r2760.
This commit is contained in:
Amar Takhar 2009-03-09 05:48:13 +00:00
parent 3df8846bcb
commit 908e9381e8
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/Makefile.am
View file

@ -5,10 +5,6 @@ if HAVE_UNIVCHARDET
univchardet = universalchardet univchardet = universalchardet
endif endif
if HAVE_AUTO3_LUA
auto3 = auto3
endif
if WITH_LIBASS if WITH_LIBASS
libass = libass libass = libass
endif endif
@ -19,7 +15,6 @@ endif
SUBDIRS = \ SUBDIRS = \
$(univchardet) \ $(univchardet) \
$(auto3) \
$(libass) \ $(libass) \
$(ffmpegsource) \ $(ffmpegsource) \
src \ src \

2
aegisub/configure.in
View file

@ -1260,10 +1260,10 @@ Makefile
src/Makefile src/Makefile
src/bitmaps/Makefile src/bitmaps/Makefile
src/libresrc/Makefile src/libresrc/Makefile
src/libauto3/Makefile
src/libosxutil/Makefile src/libosxutil/Makefile
universalchardet/Makefile universalchardet/Makefile
FFmpegSource2/Makefile FFmpegSource2/Makefile
auto3/Makefile
libass/Makefile libass/Makefile
automation/Makefile automation/Makefile
po/Makefile.in po/Makefile.in

10
aegisub/src/Makefile.am
View file

@ -8,7 +8,15 @@ libosxutil_lib = libosxutil/libosxutil.a
libosxutil_ldflags = -framework CoreFoundation libosxutil_ldflags = -framework CoreFoundation
endif endif
SUBDIRS = bitmaps libresrc $(libosxutil_subdir) if HAVE_AUTO3_LUA
libauto3 = libauto3
endif
SUBDIRS = \
bitmaps \
libresrc \
$(libauto3) \
$(libosxutil_subdir)
AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@