diff options
| author | José Fonseca <[email protected]> | 2014-11-25 23:06:25 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-11-28 17:28:20 +0000 |
| commit | f77a97f057a87e91ce249da93e723728c9a7b6c6 (patch) | |
| tree | 62ed1d92caa27e1975258018311bd02eecb14df2 /src | |
| parent | d45c35c3d7bae4234b556c68a838cf7d98b27c48 (diff) | |
mapi/glapi: Fix dll linkage of GLES1 symbols.
This fixes several MSVC warnings like:
warning C4273: 'glClearColorx' : inconsistent dll linkage
In fact, we should avoid using `declspec(dllexport)` altogether, and use
exclusively the .DEF instead, which gives more precise control of which
symbols must be exported, but all the public GL/GLES headers practically
force us to pick between `declspec(dllexport)` or
`declspec(dllimport)`.
Cc: "10.4" <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
(cherry picked from commit 5fdb6d683984ff44fca7d89e6716b1085970e993)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index bc1c43aa865..97ebfe638ae 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -16,6 +16,7 @@ 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 + 'KHRONOS_DLL_EXPORTS', # declare gl* as __declspec(dllexport) in Khronos headers ]) if env['gles']: env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS']) |