Mesa (main): win32: Do not use BUILD_GL32, we use def file to export win32 dll symbols.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a3a43e5fa85caf6be94815e08717baa67b7cb062
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3a43e5fa85caf6be94815e08717baa67b7cb062

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Sat Dec  4 15:44:51 2021 +0800

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

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14041>

---

 src/gallium/frontends/osmesa/meson.build | 2 +-
 src/mapi/es1api/meson.build              | 2 +-
 src/mapi/es2api/meson.build              | 2 +-
 src/mapi/glapi/meson.build               | 2 +-
 src/mesa/meson.build                     | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/frontends/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build
index e5848fd9934..fe78a4daa31 100644
--- a/src/gallium/frontends/osmesa/meson.build
+++ b/src/gallium/frontends/osmesa/meson.build
@@ -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
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index d28ca449593..4bca37b5e32 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -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(
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 390ee2aed18..8b133daa131 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -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(
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 270b9870b40..9f06207fe0a 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -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',
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index bc7963413ff..08b0cac4974 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -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)