Mesa (19.3): Meson: Remove lib prefix from graw and osmesa when building with Mingw.

[GitLab Mirror]

Module: Mesa
Branch: 19.3
Commit: 2bd7416823eed96e6ad30683653381d8a0061e64
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bd7416823eed96e6ad30683653381d8a0061e64

Author: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Date:   Thu Nov  7 22:04:50 2019 +0000

Meson: Remove lib prefix from graw and osmesa when building with Mingw.
Also remove version sufix from osmesa swrast on Windows.

v2: Make sure we don't remove lib prefix on *nix platforms.

Signed-off-by: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

Cc: "19.3" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 1a05811936dd8d0c3a367c6f00629624ef39d537)

---

 src/gallium/targets/graw-gdi/meson.build  | 1 +
 src/gallium/targets/graw-null/meson.build | 1 +
 src/gallium/targets/osmesa/meson.build    | 1 +
 src/mesa/drivers/osmesa/meson.build       | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/src/gallium/targets/graw-gdi/meson.build b/src/gallium/targets/graw-gdi/meson.build
index c3d3a0aac8e..563801cddd8 100644
--- a/src/gallium/targets/graw-gdi/meson.build
+++ b/src/gallium/targets/graw-gdi/meson.build
@@ -32,6 +32,7 @@ libgraw_gdi = shared_library(
   dependencies : [
     dep_ws2_32, idep_mesautil, driver_swrast,
   ],
+  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libgraw.dll
 )
 
 libgraw = libgraw_gdi
diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
index c69542705be..7e539b04418 100644
--- a/src/gallium/targets/graw-null/meson.build
+++ b/src/gallium/targets/graw-null/meson.build
@@ -32,6 +32,7 @@ libgraw_null = shared_library(
   include_directories : inc_common,
   link_with : libgallium,
   dependencies : idep_mesautil,
+  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libgraw_null.dll
 )
 
 libgraw = libgraw_null
diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
index 7792aa1e2fc..db10fe03cf3 100644
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -58,6 +58,7 @@ libosmesa = shared_library(
     dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind,
     driver_swrast, driver_swr,
   ],
+  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libosmesa.dll
   soversion : host_machine.system() == 'windows' ? '' : '8',
   version : '8.0.0',
   install : true,
diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
index c479b740131..f9ba2c5ade9 100644
--- a/src/mesa/drivers/osmesa/meson.build
+++ b/src/mesa/drivers/osmesa/meson.build
@@ -36,6 +36,8 @@ libosmesa = shared_library(
   link_whole : libglapi_static,
   link_with : [libmesa_classic, osmesa_link_with],
   dependencies : [dep_thread, dep_selinux],
+  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libosmesa.dll
+  soversion : host_machine.system() == 'windows' ? '' : '8',
   version : '8.0.0',
   install : true,
 )