diff options
| author | Jose Fonseca <[email protected]> | 2018-10-18 15:04:49 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2018-10-19 16:50:26 +0100 |
| commit | 45bacc4b63d83447c144d14cb075eaf7a458c429 (patch) | |
| tree | 727df3ac63acddb755b20962af9aaa8be0136db0 /src/mapi | |
| parent | 68c7833540fabea3d7af8eb470522e6403354e20 (diff) | |
scons: Remove gles option.
It's broken, and WGL state tracker is always built with GLES support
noawadays.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/SConscript | 6 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/SConscript | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 08fed6c0d35..118da1d53f7 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -19,12 +19,8 @@ if env['platform'] == 'windows': '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 'KHRONOS_DLL_EXPORTS', # declare gl* as __declspec(dllexport) in Khronos headers + '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport) ]) - if env['gles']: - env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS']) - else: - # prevent _glapi_* from being declared __declspec(dllimport) - env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS']) env.Append(CPPPATH = [ '#/src', diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript index 5d74bd6813f..060c61dadce 100644 --- a/src/mapi/shared-glapi/SConscript +++ b/src/mapi/shared-glapi/SConscript @@ -113,11 +113,4 @@ if env['platform'] == 'windows': else: shared_glapi = env.FindIxes(shared_glapi, 'SHLIBPREFIX', 'SHLIBSUFFIX') -# build glapi bridge as a convenience libarary for libgl-xlib/libgl-gdi -bridge_glapi_objects = mapi_objects(env, 'glapi', 'bridge') -bridge_glapi = env.ConvenienceLibrary( - target = 'glapi_bridge', - source = bridge_glapi_objects, -) - -Export(['shared_glapi', 'bridge_glapi']) +Export(['shared_glapi']) |