From 5fdb6d683984ff44fca7d89e6716b1085970e993 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 25 Nov 2014 23:06:25 +0000 Subject: 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" Reviewed-by: Brian Paul Reviewed-by: Roland Scheidegger --- src/mapi/glapi/SConscript | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mapi/glapi') 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']) -- cgit v1.2.3