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

At least the ffmpeg libraries get installed now...

Browse Source
This commit is contained in:
Ben "root" Anderson
2015-01-27 23:57:39 -06:00
parent 5f18a2aa4c
commit 2aed24ce46
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/m4/video.m4
+7 -1
View File
@@ -70,8 +70,14 @@ if test "$with_ffmpeg" = "yes"; then
fi fi
else else
dnl System FFMpeg dnl System FFMpeg
dnl HACK: $prefix is set to NONE if not user specified
if test "$prefix" = "NONE"; then
our_installdir="/opt"
else
our_installdir="$prefix"
fi
dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway. dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway.
FFMPEG_CONFFLAGS="--enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter" FFMPEG_CONFFLAGS="--shlibdir=$our_installdir/stepmania-$VERSION --enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter"
if test "$host_os" = "mingw32"; then if test "$host_os" = "mingw32"; then
FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --arch=x86" FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --arch=x86"
fi fi
bundle/Makefile.am
+6
View File
@@ -12,6 +12,12 @@ if WINDOWS
rm -f ../*.dll rm -f ../*.dll
endif endif
install:
cd ffmpeg && $(MAKE) install-libs
uninstall:
cd ffmpeg && $(MAKE) uninstall-libs
clean-local: del-dlls clean-local: del-dlls
cd ffmpeg && $(MAKE) clean cd ffmpeg && $(MAKE) clean