Commit 9c139c97 authored by Sam Hocevar's avatar Sam Hocevar

* added NASM to the contribs (OS X x86 only) so that we can build x264.

parent c3699cc1
......@@ -119,12 +119,12 @@ ifdef HAVE_DARWIN_OS
all: .autoconf .automake .libtool .iconv .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
.glib .libidl .gecko .mpcdec .expat .clinkcc .aclocal
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
ifneq ($(HOST),i686-apple-darwin8)
all: .x264 .goom2k4
all: .goom2k4
endif
else
......@@ -1152,7 +1152,11 @@ else
endif
endif
ifeq ($(HOST),i686-apple-darwin8)
.x264: .nasm x264
else
.x264: x264
endif
(cd $<; ./configure $(X264CONF) --prefix=$(PREFIX) && make && make install)
touch $@
......@@ -1806,6 +1810,22 @@ CLEAN_FILE += .clinkcc
CLEAN_PKG += clinkcc
DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz
# ***************************************************************************
# NASM assembler
# ***************************************************************************
nasm:
echo $(NASM_CVSROOT) A > ./nasm.cvs
CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
(cd $@ && autoconf && autoheader)
.nasm: nasm
(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .nasm
CLEAN_PKG += nasm nasm.cvs
# ***************************************************************************
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
......
......@@ -160,3 +160,4 @@ CLINKCC_VERSION=171
CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
EXPAT_VERSION=1.95.8
EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
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