scons: Fix build on systems without libOpenVG.so

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index 1fa4080631967e41c7f7da93305b0832ef133777..4bb063b8215511a0241aba0826faecd78519887d 100644 (file)
--- 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 8d671597859b704ab92aa748bef1b0d3a0a93701..c0c6c6c033a6e751b81d6d48cc6c3cc974115979 100644 (file)
--- 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'])