diff options
Diffstat (limited to 'src/gallium/state_trackers/python/SConscript')
| -rw-r--r-- | src/gallium/state_trackers/python/SConscript | 31 | 
1 files changed, 14 insertions, 17 deletions
diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript index 527e065cd9..781f54bf2b 100644 --- a/src/gallium/state_trackers/python/SConscript +++ b/src/gallium/state_trackers/python/SConscript @@ -24,6 +24,7 @@ if 'python' in env['statetrackers']:              'ws2_32',          ])      else: +        env.Append(CPPDEFINES = ['GCC_HASCLASSVISIBILITY'])          env.Append(LIBS = [          	'GL',              'X11', @@ -33,31 +34,27 @@ if 'python' in env['statetrackers']:          'gallium.i',          'st_device.c',          'st_sample.c', +        'st_hardpipe_winsys.c', +        'st_softpipe_winsys.c',      ] -    drivers = [ -        trace -    ] +    env.Prepend(LIBS = [ +        ws_null, +        trace, +        gallium, +    ])      if 'llvmpipe' in env['drivers']: +        env.Append(CPPDEFINES = ['HAVE_LLVMPIPE'])          env.Tool('llvm') -        sources += ['st_llvmpipe_winsys.c'] -        drivers += [llvmpipe] -    else: -        sources += ['st_softpipe_winsys.c'] -        drivers += [softpipe] - -    pyst = env.ConvenienceLibrary( -        target = 'pyst', -        source = sources, -    ) +        env.Prepend(LIBS = [llvmpipe]) +    if 'softpipe' in env['drivers']: +        env.Append(CPPDEFINES = ['HAVE_SOFTPIPE']) +        env.Prepend(LIBS = [softpipe])      env['no_import_lib'] = 1      env.SharedLibrary(          target = '_gallium', -        source = [ -            'st_hardpipe_winsys.c', -        ], -        LIBS = [pyst] + drivers + gallium + env['LIBS'], +        source = sources,      )  | 
