X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2Fmeson.build;h=ec8d668813b1edf28f8c88cbe6b1bfe3c9eb51c9;hb=2ef983dca61b549a9242afd9008200b231a26e90;hp=05268f58f3f138fe0eb07ae3fff9fddac034426c;hpb=6a9611763b698e998deaab45ce35751173b088fd;p=mesa.git

diff --git a/src/loader/meson.build b/src/loader/meson.build
index 05268f58f3f..ec8d668813b 100644
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -23,9 +23,9 @@ inc_loader = include_directories('.')
 if with_platform_x11 and with_dri3
   libloader_dri3_helper = static_library(
     'loader_dri3_helper',
-    ['loader_dri3_helper.c', 'loader_dri3_helper.h'],
-    c_args : c_vis_args,
-    include_directories : inc_include,
+    'loader_dri3_helper.c',
+    gnu_symbol_visibility : 'hidden',
+    include_directories : [inc_include, inc_src],
     dependencies : [
       dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
     ],
@@ -35,12 +35,21 @@ else
   libloader_dri3_helper = []
 endif
 
+loader_c_args = [
+  '-DUSE_DRICONF',
+  '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
+]
+
+if with_gallium_iris and get_option('prefer-iris')
+  loader_c_args += ['-DPREFER_IRIS']
+endif
+
 libloader = static_library(
   'loader',
-  ['loader.c', 'loader.h', 'pci_id_driver_map.c', 'pci_id_driver_map.h',
-   xmlpool_options_h],
-  c_args : [c_vis_args, '-DUSE_DRICONF'],
+  ['loader.c', 'pci_id_driver_map.c'],
+  c_args : loader_c_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_include, inc_src, inc_util],
-  dependencies : dep_libdrm,
+  dependencies : [dep_libdrm, dep_thread],
   build_by_default : false,
 )