Mesa (staging/21.1): meson: link vulkan_util with link_whole on mingw

2021-05-16 Thread GitLab Mirror 
Module: Mesa
Branch: staging/21.1
Commit: c51a8d12734e3ed05d0c02713f7452bccad8622e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c51a8d12734e3ed05d0c02713f7452bccad8622e

Author: Michel Zou 
Date:   Sun Apr 18 15:44:58 2021 +0200

meson: link vulkan_util with link_whole on mingw

It was missing for mingw.

Closes #4633

Reviewed-by: Jason Ekstrand 
Acked-by: James Park 
(cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

Part-of: 

---

 .pick_status.json   | 2 +-
 src/vulkan/util/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01123a6218d..be369e5b1f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6700,7 +6700,7 @@
 "description": "meson: link vulkan_util with link_whole on mingw",
 "nominated": false,
 "nomination_type": null,
-"resolution": 4,
+"resolution": 1,
 "master_sha": null,
 "because_sha": null
 },
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index c5526a2f52f..8b51d076b46 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -125,7 +125,7 @@ idep_vulkan_util_headers = declare_dependency(
   include_directories : include_directories('.')
 )
 
-if with_platform_windows
+if cc.get_id() == 'msvc'
   idep_vulkan_util = declare_dependency(
 link_with : libvulkan_util,
 dependencies : idep_vulkan_util_headers

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (staging/21.1): meson: link vulkan_util with link_whole on mingw

2021-05-10 Thread GitLab Mirror 
Module: Mesa
Branch: staging/21.1
Commit: c51a8d12734e3ed05d0c02713f7452bccad8622e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c51a8d12734e3ed05d0c02713f7452bccad8622e

Author: Michel Zou 
Date:   Sun Apr 18 15:44:58 2021 +0200

meson: link vulkan_util with link_whole on mingw

It was missing for mingw.

Closes #4633

Reviewed-by: Jason Ekstrand 
Acked-by: James Park 
(cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

Part-of: 

---

 .pick_status.json   | 2 +-
 src/vulkan/util/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01123a6218d..be369e5b1f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6700,7 +6700,7 @@
 "description": "meson: link vulkan_util with link_whole on mingw",
 "nominated": false,
 "nomination_type": null,
-"resolution": 4,
+"resolution": 1,
 "master_sha": null,
 "because_sha": null
 },
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index c5526a2f52f..8b51d076b46 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -125,7 +125,7 @@ idep_vulkan_util_headers = declare_dependency(
   include_directories : include_directories('.')
 )
 
-if with_platform_windows
+if cc.get_id() == 'msvc'
   idep_vulkan_util = declare_dependency(
 link_with : libvulkan_util,
 dependencies : idep_vulkan_util_headers

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (staging/21.1): meson: link vulkan_util with link_whole on mingw

2021-05-10 Thread GitLab Mirror 
Module: Mesa
Branch: staging/21.1
Commit: c51a8d12734e3ed05d0c02713f7452bccad8622e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c51a8d12734e3ed05d0c02713f7452bccad8622e

Author: Michel Zou 
Date:   Sun Apr 18 15:44:58 2021 +0200

meson: link vulkan_util with link_whole on mingw

It was missing for mingw.

Closes #4633

Reviewed-by: Jason Ekstrand 
Acked-by: James Park 
(cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

Part-of: 

---

 .pick_status.json   | 2 +-
 src/vulkan/util/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01123a6218d..be369e5b1f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6700,7 +6700,7 @@
 "description": "meson: link vulkan_util with link_whole on mingw",
 "nominated": false,
 "nomination_type": null,
-"resolution": 4,
+"resolution": 1,
 "master_sha": null,
 "because_sha": null
 },
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index c5526a2f52f..8b51d076b46 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -125,7 +125,7 @@ idep_vulkan_util_headers = declare_dependency(
   include_directories : include_directories('.')
 )
 
-if with_platform_windows
+if cc.get_id() == 'msvc'
   idep_vulkan_util = declare_dependency(
 link_with : libvulkan_util,
 dependencies : idep_vulkan_util_headers

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (staging/21.1): meson: link vulkan_util with link_whole on mingw

2021-05-10 Thread GitLab Mirror 
Module: Mesa
Branch: staging/21.1
Commit: 177f71c77d02cc47bb96cba112e235f5215c0929
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=177f71c77d02cc47bb96cba112e235f5215c0929

Author: Michel Zou 
Date:   Sun Apr 18 15:44:58 2021 +0200

meson: link vulkan_util with link_whole on mingw

It was missing for mingw.

Closes #4633

Reviewed-by: Jason Ekstrand 
Acked-by: James Park 
(cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

Part-of: 

---

 .pick_status.json   | 2 +-
 src/vulkan/util/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 01123a6218d..be369e5b1f7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6700,7 +6700,7 @@
 "description": "meson: link vulkan_util with link_whole on mingw",
 "nominated": false,
 "nomination_type": null,
-"resolution": 4,
+"resolution": 1,
 "master_sha": null,
 "because_sha": null
 },
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index c5526a2f52f..8b51d076b46 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -125,7 +125,7 @@ idep_vulkan_util_headers = declare_dependency(
   include_directories : include_directories('.')
 )
 
-if with_platform_windows
+if cc.get_id() == 'msvc'
   idep_vulkan_util = declare_dependency(
 link_with : libvulkan_util,
 dependencies : idep_vulkan_util_headers

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (staging/21.1): meson: link vulkan_util with link_whole on mingw

2021-05-10 Thread GitLab Mirror 
Module: Mesa
Branch: staging/21.1
Commit: ca2dcf09392bb11acd503892fe75a0f5cf21e947
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca2dcf09392bb11acd503892fe75a0f5cf21e947

Author: Michel Zou 
Date:   Sun Apr 18 15:44:58 2021 +0200

meson: link vulkan_util with link_whole on mingw

It was missing for mingw.

Closes #4633

Reviewed-by: Jason Ekstrand 
Acked-by: James Park 
(cherry picked from commit 48d31a6280c4de07279435606a5c0524c1787cad)

Part-of: 

---

 src/vulkan/util/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index c5526a2f52f..8b51d076b46 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -125,7 +125,7 @@ idep_vulkan_util_headers = declare_dependency(
   include_directories : include_directories('.')
 )
 
-if with_platform_windows
+if cc.get_id() == 'msvc'
   idep_vulkan_util = declare_dependency(
 link_with : libvulkan_util,
 dependencies : idep_vulkan_util_headers

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit