Skip to content

Commit a3a43e5

Browse files
lygstateMarge Bot
authored and
Marge Bot
committed
win32: Do not use BUILD_GL32, we use def file to export win32 dll symbols.
Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14041>
1 parent 4ead2f6 commit a3a43e5

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

src/gallium/frontends/osmesa/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
osmesa_st_c_args = []
2222
if with_platform_windows
23-
osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN']
23+
osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN']
2424
if not with_shared_glapi
2525
osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS']
2626
endif

src/mapi/es1api/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ es1_glapi_mapi_tmp_h = custom_target(
2929

3030
_es1_c_args = []
3131
if with_platform_windows
32-
_es1_c_args += ['-D_GDI32_', '-DBUILD_GL32']
32+
_es1_c_args += ['-D_GDI32_']
3333
endif
3434

3535
gles1_def = custom_target(

src/mapi/es2api/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ es2_glapi_mapi_tmp_h = custom_target(
2929

3030
_es2_c_args = []
3131
if with_platform_windows
32-
_es2_c_args += ['-D_GDI32_', '-DBUILD_GL32']
32+
_es2_c_args += ['-D_GDI32_']
3333
endif
3434

3535
gles2_def = custom_target(

src/mapi/glapi/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if with_shared_glapi
5252
else
5353
static_glapi_args += '-DMAPI_MODE_UTIL'
5454
if with_platform_windows
55-
static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
55+
static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
5656
endif
5757
static_glapi_files += files(
5858
'glapi_dispatch.c',

src/mesa/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ _mesa_windows_args = []
489489
if with_platform_windows
490490
_mesa_windows_args += [
491491
'-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
492-
'-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers
493492
]
494493
if not with_shared_glapi
495494
# prevent _glapi_* from being declared __declspec(dllimport)

0 commit comments

Comments
 (0)