aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <[email protected]>2019-07-26 13:49:59 +0200
committerBas Nieuwenhuizen <[email protected]>2019-08-07 15:34:46 +0200
commit5a26f528cb86697ff9f68998a0fe5c2f4ca75855 (patch)
tree8b72779d98573075d4e24f3a63231c60ee0bc5d6 /src/mesa/drivers
parentda9e2958ec3d0cb7ff8aba5b2eb3d6be3cb53bb3 (diff)
meson,i965: Link with android deps when building for android.
The DBG marco in brw_blorp.c ends up calling an android log function: error: undefined reference to '__android_log_print' v2: On suggestion from Lionel, hang the Android dependency onto a new libintel_common dependency. Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/meson.build9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 3c507126f08..465567add3f 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -157,8 +157,11 @@ libi965 = static_library(
c_args : [c_vis_args, no_override_init_args, c_sse2_args],
cpp_args : [cpp_vis_args, c_sse2_args],
link_with : [
- i965_gen_libs, libintel_common, libintel_dev, libisl, libintel_compiler,
- libblorp, libintel_perf
+ i965_gen_libs, libintel_dev, libisl, libintel_compiler, libblorp,
+ libintel_perf
+ ],
+ dependencies : [
+ dep_libdrm, dep_valgrind, idep_libintel_common, idep_nir_headers, idep_genxml,
+ idep_xmlconfig,
],
- dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_xmlconfig],
)