Changeset a69221d4ee4b6485d714ce7c43f3fddf3dee3b92

Show
Ignore:
Timestamp:
04/13/08 20:05:16 (3 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1208109916 +0200
git-parent:

[9d98ad6a2c546d5e8f7278db25c8c12d91c56061]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1208109901 +0200
Message:

Removed nasm from the contribs and changed the build behaviour for yasm: it's only compiled on Intel-based Macs as PPC-based Macs don't need it.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Distributions/darwin.mak

    rd3e0b1b ra69221d  
    55    libdvdcss libdvdnav libdvbpsi live libcaca libmodplug xml asa jpeg tiff \ 
    66    SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \ 
    7     libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib nasm \ 
    8     yasm x264 goom lua zvbi fontconfig ncurses all 
     7    libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib \ 
     8    x264 yasm goom lua zvbi fontconfig ncurses all 
    99all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype \ 
    1010    .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ 
    …… 
    1313    .png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \ 
    1414    .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ 
    15     .dca .tag .nasm .yasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal 
     15    .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal 
    1616# .expat .clinkcc don't work with SDK yet 
    1717# .glib .IDL .gecko are required to build the mozilla plugin 

  • extras/contrib/src/Makefile

    r9d98ad6 ra69221d  
    13761376  endif 
    13771377else 
    1378 .x264: x264 
     1378ifdef HAVE_DARWIN_OS_ON_INTEL 
     1379  .x264: x264 .yasm 
    13791380    (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) 
     1381else 
     1382  .x264: x264 
     1383    (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) 
     1384endif 
    13801385endif 
    13811386    touch $@ 
    …… 
    22312236 
    22322237# *************************************************************************** 
    2233 # NASM assembler 
    2234 # *************************************************************************** 
    2235  
    2236 nasm-$(NASM_VERSION).tar.bz2: 
    2237     $(WGET) $(NASM_URL) 
    2238  
    2239 nasm: nasm-$(NASM_VERSION).tar.bz2 
    2240     $(EXTRACT_BZ2) 
    2241  
    2242 #nasm: 
    2243 #   echo $(NASM_CVSROOT) A > ./nasm.cvs 
    2244 #   CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm 
    2245 #   (cd $@ && autoconf && autoheader) 
    2246  
    2247 .nasm: nasm 
    2248     (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) 
    2249     touch $@ 
    2250  
    2251 CLEAN_FILE += .nasm 
    2252 CLEAN_PKG += nasm nasm.cvs 
    2253 DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2 
    2254  
    2255 # *************************************************************************** 
    22562238# YASM assembler 
    22572239# ***************************************************************************