KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: Do not use BUILD_GL32, we use def file to export win32 dll symbols. 

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14041>
This commit is contained in:
Yonggang Luo 2021-12-04 15:44:51 +08:00 committed by Marge Bot
parent 4ead2f6579
commit a3a43e5fa8
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/osmesa/meson.build
View File

@ -20,7 +20,7 @@
osmesa_st_c_args = []
if with_platform_windows
osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN']
osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN']
if not with_shared_glapi
osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS']
endif

2
src/mapi/es1api/meson.build
View File

@ -29,7 +29,7 @@ es1_glapi_mapi_tmp_h = custom_target(
_es1_c_args = []
if with_platform_windows
_es1_c_args += ['-D_GDI32_', '-DBUILD_GL32']
_es1_c_args += ['-D_GDI32_']
endif
gles1_def = custom_target(

2
src/mapi/es2api/meson.build
View File

@ -29,7 +29,7 @@ es2_glapi_mapi_tmp_h = custom_target(
_es2_c_args = []
if with_platform_windows
_es2_c_args += ['-D_GDI32_', '-DBUILD_GL32']
_es2_c_args += ['-D_GDI32_']
endif
gles2_def = custom_target(

2
src/mapi/glapi/meson.build
View File

@ -52,7 +52,7 @@ if with_shared_glapi
else
static_glapi_args += '-DMAPI_MODE_UTIL'
if with_platform_windows
static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
endif
static_glapi_files += files(
'glapi_dispatch.c',

1
src/mesa/meson.build
View File

@ -489,7 +489,6 @@ _mesa_windows_args = []
if with_platform_windows
_mesa_windows_args += [
'-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
'-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers
]
if not with_shared_glapi
# prevent _glapi_* from being declared __declspec(dllimport)