forked from mia/Aegisub
Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3.
Originally committed to SVN as r2760.
This commit is contained in:
parent
7740439efd
commit
a9180cfcf7
3 changed files with 10 additions and 7 deletions
|
@ -5,10 +5,6 @@ if HAVE_UNIVCHARDET
|
|||
univchardet = universalchardet
|
||||
endif
|
||||
|
||||
if HAVE_AUTO3_LUA
|
||||
auto3 = auto3
|
||||
endif
|
||||
|
||||
if WITH_LIBASS
|
||||
libass = libass
|
||||
endif
|
||||
|
@ -19,7 +15,6 @@ endif
|
|||
|
||||
SUBDIRS = \
|
||||
$(univchardet) \
|
||||
$(auto3) \
|
||||
$(libass) \
|
||||
$(ffmpegsource) \
|
||||
src \
|
||||
|
|
|
@ -1260,10 +1260,10 @@ Makefile
|
|||
src/Makefile
|
||||
src/bitmaps/Makefile
|
||||
src/libresrc/Makefile
|
||||
src/libauto3/Makefile
|
||||
src/libosxutil/Makefile
|
||||
universalchardet/Makefile
|
||||
FFmpegSource2/Makefile
|
||||
auto3/Makefile
|
||||
libass/Makefile
|
||||
automation/Makefile
|
||||
po/Makefile.in
|
||||
|
|
|
@ -8,7 +8,15 @@ libosxutil_lib = libosxutil/libosxutil.a
|
|||
libosxutil_ldflags = -framework CoreFoundation
|
||||
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@
|
||||
|
||||
|
|
Loading…
Reference in a new issue