4 files changed, 2 insertions, 18 deletions
diff --git a/src/gallium/state_trackers/osmesa/SConscript b/src/gallium/state_trackers/osmesa/SConscript
index f5519f13762..be67d0fe739 100644
--- a/src/gallium/state_trackers/osmesa/SConscript
+++ b/src/gallium/state_trackers/osmesa/SConscript
@@ -14,10 +14,8 @@ if env['platform'] == 'windows':
     env.AppendUnique(CPPDEFINES = [
         'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
         'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
+        '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
     ])
-    if not env['gles']:
-        # prevent _glapi_* from being declared __declspec(dllimport)
-        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
 
 st_osmesa = env.ConvenienceLibrary(
     target ='st_osmesa',
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index a7fbb07a89a..bbf5ebd9764 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -14,10 +14,8 @@ env.AppendUnique(CPPDEFINES = [
     '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
     'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
     'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
+    '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
 ])
-if not env['gles']:
-    # prevent _glapi_* from being declared __declspec(dllimport)
-    env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
 
 wgl = env.ConvenienceLibrary(
     target ='wgl',
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 132cb73358d..94feca24ef3 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -48,12 +48,6 @@ else:
 
 env['no_import_lib'] = 1
 
-# when GLES is enabled, gl* and _glapi_* belong to bridge_glapi and
-# shared_glapi respectively
-if env['gles']:
-    env.Prepend(LIBPATH = [shared_glapi.dir])
-    glapi = [bridge_glapi, 'libglapi']
-
 opengl32 = env.SharedLibrary(
     target ='opengl32',
     source = sources,
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index fb7a0ce50e3..b49b4e6fe2a 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -18,12 +18,6 @@ env.Append(CPPDEFINES = ['USE_XSHM'])
 env.Prepend(LIBS = env['X11_LIBS'])
 env.Prepend(LIBPATH = env['X11_LIBPATH'])
 
-# when GLES is enabled, gl* and _glapi_* belong to bridge_glapi and
-# shared_glapi respectively
-if env['gles']:
-    env.Prepend(LIBPATH = [shared_glapi.dir])
-    glapi = [bridge_glapi, 'glapi']
-
 env.Prepend(LIBS = [
     st_xlib,
     ws_xlib,