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/mesa | |
| 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/mesa')
| -rw-r--r-- | src/mesa/SConscript | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/SConscript | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 5a21b64f561..eaf23fbae18 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -27,10 +27,8 @@ if env['platform'] == 'windows': env.Append(CPPDEFINES = [ '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers + '_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']) # parse Makefile.sources source_lists = env.ParseSourceList('Makefile.sources') diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript index 064f3da5da9..b08a79eb8a5 100644 --- a/src/mesa/drivers/osmesa/SConscript +++ b/src/mesa/drivers/osmesa/SConscript @@ -28,10 +28,8 @@ if env['platform'] == 'windows': env.AppendUnique(CPPDEFINES = [ '_GDI32_', # prevent wgl* being declared __declspec(dllimport) 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers + '_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']) sources += ['osmesa.def'] |