scons: Add support for GLES.

[mesa.git] / src / gallium / targets / egl-static / SConscript

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index 3eba9e07f20bb8016530d0b953b5bcbc297381c1..c978934a0c8b577bfa7b95e8f0125ee793d2edc2 100644 (file)
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -32,6 +32,7 @@ env.Prepend(LIBS = [
     galahad,
     gallium,
     egl,
+    st_egl,
 ])
 
 if env['llvm']:
@@ -55,28 +56,34 @@ if env['platform'] == 'windows':
     ])
 
     env.Prepend(LIBS = [
-        st_egl,
         ws_gdi,
     ])
 
-    # OpenVG
-    env.Append(CPPDEFINES = ['FEATURE_VG=1'])
-    env.Prepend(LIBS = [openvg, st_vega])
-else:
-    env.Prepend(LIBS = [
-        st_egl,
-        ws_xlib,
+# OpenGL ES and OpenGL
+if env['gles']:
+    env.Append(CPPDEFINES = [
+        'FEATURE_GL=1',
+        'FEATURE_ES1=1',
+        'FEATURE_ES2=1'
     ])
+    env.Prepend(LIBPATH = [shared_glapi.dir])
+    # manually add LIBPREFIX on windows
+    glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'
+    env.Prepend(LIBS = [glapi_name, talloc, glsl, mesa])
 
-    # OpenGL
-    env.Append(CPPDEFINES = ['FEATURE_GL=1'])
-    env.Prepend(LIBS = ['GL', 'talloc', glsl, mesa])
-
-    # OpenVG
+# OpenVG
+if True:
     env.Append(CPPDEFINES = ['FEATURE_VG=1'])
     env.Prepend(LIBPATH = [openvg.dir])
-    env.Prepend(LIBS = ['OpenVG', st_vega])
+    # manually add LIBPREFIX on windows
+    openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG'
+    env.Prepend(LIBS = [openvg_name, st_vega])
 
+if env['x11']:
+    env.Prepend(LIBS = [
+        ws_xlib,
+        env['X11_LIBS'],
+    ])
 
 if env['dri']:
     env.ParseConfig('pkg-config --cflags --libs xfixes')
@@ -93,6 +100,7 @@ if env['drm']:
             i915,
             i965drm,
             i965,
+            ws_wrapper,
         ])
 
     if env['drm_radeon']:
@@ -112,6 +120,7 @@ if env['drm']:
     ])
 
 # libEGL.dll
+env['LIBPREFIX'] = 'lib'
 env['SHLIBPREFIX'] = 'lib'
 
 egl_gallium = env.SharedLibrary(