fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: Add windows defines to glapi

Browse source 
These are needed to control the export or symbols due to differences
between the way windows and *nix handle symbol exports.

Reviewed-by: Eric Anholt <eric@anholt.net> (v2)
Acked-by: Kristian H. Kristensen <hoegsberg@google.com>

v5: - key NO_EXPORT off of shared-glapi instead of gles
This commit is contained in:
Dylan Baker 2018-04-18 13:22:35 -07:00
parent 3aee462781
commit 2e17348600
4 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mapi/es1api/meson.build
View file

@ -27,11 +27,19 @@ es1_glapi_mapi_tmp_h = custom_target(
capture : true,
)
_es1_c_args = []
if with_platform_windows
_es1_c_args += ['-D_GDI32_', '-DBUILD_GL32']
endif
libglesv1_cm = shared_library(
'GLESv1_CM' + get_option('gles-lib-suffix'),
['../entry.c', es1_glapi_mapi_tmp_h],
c_args : [
c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
c_msvc_compat_args,
c_vis_args,
_es1_c_args,
'-DMAPI_MODE_BRIDGE',
'-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path()),
gcc_lto_quirk,
],

10
src/mapi/es2api/meson.build
View file

@ -27,11 +27,19 @@ es2_glapi_mapi_tmp_h = custom_target(
capture : true,
)
_es2_c_args = []
if with_platform_windows
_es2_c_args += ['-D_GDI32_', '-DBUILD_GL32']
endif
libgles2 = shared_library(
'GLESv2' + get_option('gles-lib-suffix'),
['../entry.c', es2_glapi_mapi_tmp_h],
c_args : [
c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
c_msvc_compat_args,
c_vis_args,
_es2_c_args,
'-DMAPI_MODE_BRIDGE',
'-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path()),
gcc_lto_quirk,
],

13
src/mapi/glapi/meson.build
View file

@ -25,7 +25,7 @@ inc_glapi = include_directories('.')
static_glapi_files = []
static_glapi_args = []
if ['apple', 'windows'].contains(with_dri_platform)
if with_dri and ['apple', 'windows'].contains(with_dri_platform)
static_glapi_files += [glapi_gentable_c, glapitable_h]
endif
@ -46,8 +46,19 @@ if with_shared_glapi
'-DMAPI_ABI_HEADER="@0@"'.format(glapi_mapi_tmp_h.full_path()),
gcc_lto_quirk,
]
if with_platform_windows
static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32']
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
endif
static_glapi_files += files(
'glapi_dispatch.c',
'glapi_entrypoint.c',

10
src/mapi/shared-glapi/meson.build
View file

@ -36,11 +36,19 @@ shared_glapi_mapi_tmp_h = custom_target(
capture : true,
)
_glapi_c_args = []
if with_platform_windows
_glapi_c_args += ['-D_GLAPI_DLL_EXPORTS']
endif
libglapi = shared_library(
'glapi',
[files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
c_args : [
c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_GLAPI',
_glapi_c_args,
c_msvc_compat_args,
c_vis_args,
'-DMAPI_MODE_GLAPI',
'-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path()),
gcc_lto_quirk,
],