Skip to content

V
vlc
Commit ae83354a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

contrib: avoid Darwin patch on other systems 

(cherry picked from commit 0e00a98a)

Conflicts:

	extras/contrib/src/Makefile
parent 4a1e4cbc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
extras/contrib/src/Makefile
View file @ ae83354a
...@@ -1027,11 +1027,13 @@ endif ...@@ -1027,11 +1027,13 @@ endif
ifdef HAVE_BEOS ifdef HAVE_BEOS
(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
endif endif
ifdef HAVE_DARWIN_OS
ifdef HAVE_DARWIN_OS_ON_INTEL ifdef HAVE_DARWIN_OS_ON_INTEL
(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
else else
(cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch)
endif endif
endif
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-uclibc.patch patch -p0 < Patches/ffmpeg-svn-uclibc.patch
patch -p0 < Patches/ffmpeg-svn-internal-define.patch patch -p0 < Patches/ffmpeg-svn-internal-define.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment