diff options
| author | José Fonseca <[email protected]> | 2011-01-12 15:06:57 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-01-12 15:06:57 +0000 |
| commit | b07ad1d6bd08bfe3ab84b660587523d5711ea21f (patch) | |
| tree | 0c9161d04e46313d38b54fc8a9d04269cf4bfaa9 /src | |
| parent | 1e4f412242391000eea3fd28452865c3d27f987d (diff) | |
scons: Fix build on systems without libOpenVG.so
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 3 | ||||
| -rw-r--r-- | src/mapi/vgapi/SConscript | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index 1fa40806319..4bb063b8215 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -74,6 +74,7 @@ else: # OpenVG env.Append(CPPDEFINES = ['FEATURE_VG=1']) + env.Prepend(LIBPATH = [openvg.dir]) env.Prepend(LIBS = ['OpenVG', st_vega]) @@ -115,7 +116,7 @@ egl_gallium = env.SharedLibrary( source = sources, ) -env.Depends(egl_gallium, [vgapi]) +env.Depends(egl_gallium, [openvg]) egl_gallium = env.InstallSharedLibrary(egl_gallium, version=(1, 4, 0)) diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript index 8d671597859..c0c6c6c033a 100644 --- a/src/mapi/vgapi/SConscript +++ b/src/mapi/vgapi/SConscript @@ -45,15 +45,15 @@ if env['platform'] != 'winddk': env.Depends(vgapi_objects, vgapi_header) openvg = env.SharedLibrary( - target = 'libOpenVG', + target = 'OpenVG', source = vgapi_objects, ) env.InstallSharedLibrary(openvg, version=(1, 0, 0)) if env['platform'] == 'windows': - vgapi = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX') + openvg = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX') else: - vgapi = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX') + openvg = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX') - Export(['vgapi']) + Export(['openvg']) |