← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpv/vivid

« back to all changes in this revision

Viewing changes to waflib/Tools/nasm.py

  • Committer: Package Import Robot
  • Author(s): Alessandro Ghedini
  • Date: 2013-12-29 20:04:26 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20131229200426-w0qsj8clnui1pxaw
Tags: 0.3.0-1
http://bugs.debian.org/732271
* New upstream release
  - Fix --vf=expand example in manpage (Closes: #732271)
* Add 03_waf.patch to provide uncompressed waf scripts and modules
* Switch to waf build script
* Drop libmng-dev Build-Depends (not used anymore)
* Bump Standards-Version to 3.9.5 (no changes needed)
* Enable support for dvdnav
* Install more docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
waflib/Tools/nasm.py
 
1
#! /usr/bin/env python
 
2
# encoding: utf-8
 
3
# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
 
4
 
 
5
import waflib.Tools.asm
 
6
from waflib.TaskGen import feature
 
7
@feature('asm')
 
8
def apply_nasm_vars(self):
 
9
        self.env.append_value('ASFLAGS',self.to_list(getattr(self,'nasm_flags',[])))
 
10
def configure(conf):
 
11
        nasm=conf.find_program(['nasm','yasm'],var='AS')
 
12
        conf.env.AS_TGT_F=['-o']
 
13
        conf.env.ASLNK_TGT_F=['-o']
 
14
        conf.load('asm')