summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2014-11-25 23:06:25 +0000
committerJosé Fonseca <jfonseca@vmware.com>2014-11-26 20:31:07 +0000
commit5fdb6d683984ff44fca7d89e6716b1085970e993 (patch)
tree5538fb4a97fb3f02c9bce407a9d6eb104bc3738b
parent4b6e93650cfe5f2c285cf601d7f3e8286ce40d3c (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" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
-rw-r--r--src/mapi/glapi/SConscript1
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'])