Skip to content

V
vlc-1.1
Commit cc108086 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: fix 64bit compilation on Leopard

parent c95dc6cc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
extras/contrib/src/Makefile
View file @ cc108086
...@@ -152,7 +152,7 @@ X264CONF=--host=$(HOST) ...@@ -152,7 +152,7 @@ X264CONF=--host=$(HOST)
X264CONF += --enable-pic X264CONF += --enable-pic
FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --cc=$(CC)
FFMPEGCONF += --arch=$(ARCH) FFMPEGCONF += --arch=$(ARCH)
ifdef HAVE_DARWIN_10 ifdef HAVE_DARWIN_64
FFMPEGCONF += --cpu=core2 FFMPEGCONF += --cpu=core2
X264CONF+=--host=x86_64-apple-darwin10 X264CONF+=--host=x86_64-apple-darwin10
endif endif
...@@ -801,7 +801,7 @@ ifdef HAVE_WIN32 ...@@ -801,7 +801,7 @@ ifdef HAVE_WIN32
THEORACONF += --disable-docs THEORACONF += --disable-docs
endif endif
ifdef HAVE_DARWIN_10 ifdef HAVE_DARWIN_64
THEORACONF += --disable-asm THEORACONF += --disable-asm
endif endif
ifdef HAVE_WIN64 ifdef HAVE_WIN64
...@@ -1915,7 +1915,7 @@ glib-$(GLIB_VERSION).tar.bz2: ...@@ -1915,7 +1915,7 @@ glib-$(GLIB_VERSION).tar.bz2:
glib: glib-$(GLIB_VERSION).tar.bz2 glib: glib-$(GLIB_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
(cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch) (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
ifdef HAVE_DARWIN_10 ifdef HAVE_DARWIN_64
(cd $@; patch -p0 < ../Patches/glib-Darwin64.patch) (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
endif endif
......
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