Skip to content

V
vlc-2-2
Commit bff6cc3c authored by Eric Petit's avatar Eric Petit
Browse files
Options

contrib/src/Makefile: libvorbis now supports --host, so let's use it

parent 9f7cb303
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
extras/contrib/src/Makefile
View file @ bff6cc3c
...@@ -50,7 +50,7 @@ export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/prefer ...@@ -50,7 +50,7 @@ export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/prefer
export LIBRARY_PATH = $(PREFIX)/lib:%A/lib:/boot/home/config/lib:/boot/beos/system/lib export LIBRARY_PATH = $(PREFIX)/lib:%A/lib:/boot/home/config/lib:/boot/beos/system/lib
else else
# Cross compiling from Linux # Cross compiling from Linux
export PATH = $(PREFIX)/bin:/opt/cross-tools/bin:/usr/bin:/bin export PATH = $(PREFIX)/bin:/opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/bin
endif endif
endif endif
...@@ -512,11 +512,9 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz ...@@ -512,11 +512,9 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
.vorbis: libvorbis .ogg .vorbis: libvorbis .ogg
# libvorbis' configure doesn't handle --host # FIXME: shared libs disabled for now because of linking errors
# FIXME: shared libs disabled for now because configure thinks we should # -- titer 2005/09/16
# link the .so to -lc when cross-compiling to BeOS (-> fails) (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
# -- titer 2005/02/12
(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
# $(INSTALL_NAME) # $(INSTALL_NAME)
touch $@ touch $@
......
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