v2: - set so_version to '' (only affects windows)
- always set lib prefix to 'lib', even on msvc
---
src/gallium/state_trackers/osmesa/meson.build | 12 ++++++++++--
src/gallium/targets/osmesa/meson.build | 11 ++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/gallium/state_trackers/osmesa/meson.build
b/src/gallium/state_trackers/osmesa/meson.build
index 912a6226f74..26ec8084f93 100644
--- a/src/gallium/state_trackers/osmesa/meson.build
+++ b/src/gallium/state_trackers/osmesa/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2018 Intel Corporation
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -18,10 +18,18 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
+osmesa_st_c_args = []
+if with_platform_windows
+ osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN']
+ if not with_gles1
+ osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS']
+ endif
+endif
+
libosmesa_st = static_library(
'osmesa_st',
'osmesa.c',
- c_args : ['-DGALLIUM_SOFTPIPE'],
+ c_args : osmesa_st_c_args,
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa,
],
diff --git a/src/gallium/targets/osmesa/meson.build
b/src/gallium/targets/osmesa/meson.build
index b4ae8f4b6ec..d92117988eb 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,10 +55,12 @@ libosmesa = shared_library(
libmesa_gallium, libgallium, libglapi_static, 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',
+ name_prefix : 'lib',
install : true,
)
--
2.18.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
