Commit bbdbad09 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Removed nasm in favour of yasm for Darwin-x86. Note that yasm isn't build on...

Removed nasm in favour of yasm for Darwin-x86. Note that yasm isn't build on PowerPC-based Macs because it's not needed.
parent a69221d4
......@@ -2235,6 +2235,7 @@ CLEAN_PKG += clinkcc
DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
# ***************************************************************************
<<<<<<< Updated upstream:extras/contrib/src/Makefile
# YASM assembler
# ***************************************************************************
......@@ -2253,6 +2254,8 @@ CLEAN_PKG += yasm
DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
# ***************************************************************************
=======
>>>>>>> Stashed changes:extras/contrib/src/Makefile
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
......
......@@ -199,9 +199,6 @@ UPNP_VERSION=1.2.1
UPNP_URL=$(SF)/upnp/libupnp-$(UPNP_VERSION).tar.gz
EXPAT_VERSION=2.0.0
EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
NASM_VERSION=2.02
NASM_URL=$(SF)/nasm/nasm-$(NASM_VERSION).tar.bz2
PTHREADS_VERSION=2-8-0
PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
UNICOWS_VERSION=1.1.1
......
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