← Back to branch summary

~ubuntu-branches/ubuntu/wily/xmms2/wily

« back to all changes in this revision

Viewing changes to src/clients/cli/wscript

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2008-07-04 16:23:34 UTC
  • mfrom: (1.1.5 upstream) (6.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080704162334-b3esbkcapt8wbrk4
Tags: 0.5DrLecter-2ubuntu1
https://launchpad.net/bugs/241098
https://launchpad.net/bugs/212566
https://launchpad.net/bugs/222341
* Merge from debian unstable (LP: #241098), remaining changes:
  + debian/control:
    + Update Maintainer field
    + add lpia to xmms2-plugin-alsa supported architectures
    + Added liba52-0.7.4-dev to build depends
  + debian/rules: Added patch, patch-stamp and unpatch
  + changed 01_gcc4.3.patch:
    + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
* New upstream relase fixes LP: #212566, #222341

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/clients/cli/wscript
1
1
import Params
2
2
 
3
3
def build(bld):
4
 
    env = bld.env_of_name('default')
 
4
    env = bld.env()
5
5
 
6
6
    obj = bld.create_obj('cc', 'program')
7
7
    obj.target = 'xmms2'
17
17
    obj.source.append('common_%s.c' % env['common_impl'])
18
18
 
19
19
    if env["xmms_icon"]:
20
 
        obj.source.append('../../../pixmaps/xmms2.rc')
 
20
        obj.add_objects = 'xmms_icon'
21
21
 
22
22
    obj.includes = '. ../../include'
23
23
    obj.uselib_local = 'xmmsclient-glib xmmsclient'