actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes issue #216 : Cannot build with --without-ffmpeg

Browse Source
This commit is contained in:
Pat Mac
2014-07-10 04:09:30 +00:00
parent 3b1270b909
commit 35052f29b4
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/m4/video.m4
+1
View File
@@ -7,6 +7,7 @@ AC_ARG_WITH(static-ffmpeg, AS_HELP_STRING([--with-static-ffmpeg],[Statically lin
AM_CONDITIONAL(STATIC_FFMPEG, test "$with_static_ffmpeg" = "yes") AM_CONDITIONAL(STATIC_FFMPEG, test "$with_static_ffmpeg" = "yes")
AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no) AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no)
AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes") AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes")
AM_CONDITIONAL(WITHOUT_FFMPEG, test "$with_ffmpeg" != "yes")
VIDEO_CFLAGS= VIDEO_CFLAGS=
VIDEO_LIBS= VIDEO_LIBS=
bundle/Makefile.am
+2
View File
@@ -1,9 +1,11 @@
if !WITHOUT_FFMPEG
if !SYSTEM_FFMPEG if !SYSTEM_FFMPEG
all-local: all-local:
cd ffmpeg && $(MAKE) cd ffmpeg && $(MAKE)
if WINDOWS if WINDOWS
cp ffmpeg/*/*.dll .. cp ffmpeg/*/*.dll ..
endif endif
endif
del-dlls: del-dlls:
if WINDOWS if WINDOWS