Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 93583 | Differences between
and this patch

Collapse All | Expand All

(-)a/wscript (-6 / +11 lines)
Lines 265-276 def configure(conf): Link Here
265
    conf.check_tool('gcc')
265
    conf.check_tool('gcc')
266
    conf.check_tool('g++')
266
    conf.check_tool('g++')
267
267
268
    try:
269
        conf.check_tool('winres')
270
        conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
271
        conf.env['xmms_icon'] = True
272
    except Configure.ConfigurationError:
273
        conf.env['xmms_icon'] = False
274
268
275
    if Options.options.target_platform:
269
    if Options.options.target_platform:
276
        Options.platform = Options.options.target_platform
270
        Options.platform = Options.options.target_platform
Lines 412-417 def configure(conf): Link Here
412
    else:
406
    else:
413
        conf.env['socket_impl'] = 'posix'
407
        conf.env['socket_impl'] = 'posix'
414
408
409
    # platform does not support icons ...
410
    conf.env['xmms_icon'] = False
411
    # ... unless we target on windows
412
    if Options.platform == 'win32':
413
        try:
414
            conf.check_tool('winres')
415
            conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
416
            conf.env['xmms_icon'] = True
417
        except Configure.ConfigurationError:
418
            pass
419
415
    # Glib is required by everyone, so check for it here and let them
420
    # Glib is required by everyone, so check for it here and let them
416
    # assume its presence.
421
    # assume its presence.
417
    conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1)
422
    conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1)

Return to bug 93583