diff options
| author | Dylan Baker <[email protected]> | 2018-04-18 13:29:26 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-10 16:33:04 -0700 |
| commit | 597a063551fa413c611f5499a78ce59700fc0461 (patch) | |
| tree | db87728d6ddfa853009bbd29e938d56684bcfd9e /src/gallium/targets | |
| parent | b97a34101789e6b653043c75fd7358847b22bc5b (diff) | |
meson: fix gallium-osmesa to build for windows
v2: - set so_version to '' (only affects windows)
- always set lib prefix to 'lib', even on msvc
v5: - key NO_EXPORTS on shared glapi instead of gles.
Acked-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/osmesa/meson.build | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index 1612908d016..7792aa1e2fc 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -32,12 +32,19 @@ if with_ld_version_script osmesa_link_deps += files('osmesa.sym') endif +if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' + osmesa_def = 'osmesa.mingw.def' +else + osmesa_def = 'osmesa.def' +endif + libosmesa = shared_library( osmesa_lib_name, 'target.c', c_args : [c_vis_args], cpp_args : cpp_vis_args, link_args : [ld_args_gc_sections, osmesa_link_args], + vs_module_defs : osmesa_def, include_directories : [ inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers, @@ -48,9 +55,10 @@ libosmesa = shared_library( libmesa_gallium, libgallium, libws_null, osmesa_link_with, ], dependencies : [ - dep_selinux, dep_thread, dep_clock, dep_unwind, + dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr, ], + soversion : host_machine.system() == 'windows' ? '' : '8', version : '8.0.0', install : true, ) |