From 2a76c976d1cddb6a9db6eea644cc73ea75d755db Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 1 Sep 2021 06:58:14 -0700 Subject: [PATCH] static-glapi: Fix MSVC preprocessor definitions Previously, any DLL which links any function from libglapi-static would end up exporting the entire GL API surface area, due to the dllexport introduced by BUILD_GL32. This fix allows DLLs to internally include definitions of gl* APIs without having to export the entire surface. Also, remove unreachable with_shared_glapi branch already in an else block. Reviewed By: Bill Kristiansen Reviewed-by: Charmaine Lee >charmainel@vmware.com> Part-of: --- src/mapi/glapi/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index 1b8b685f207..3eb4318dedb 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -47,17 +47,12 @@ if with_shared_glapi gcc_lto_quirk, ] if with_platform_windows - static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32'] + static_glapi_args += ['-D_GDI32_'] endif else static_glapi_args += '-DMAPI_MODE_UTIL' if with_platform_windows - static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS'] - if with_shared_glapi - static_glapi_args += '-D_GLAPI_DLL_EXPORTS' - else - static_glapi_args += '-D_GLAPI_NO_EXPORTS' - endif + static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] endif static_glapi_files += files( 'glapi_dispatch.c',