X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgbm%2Fmeson.build;h=2e9d380c0b47f735cf18da5c35bad758b820fc8b;hb=9d5b106b2efbd5a4bbbe54a5a00c8cebd642d960;hp=1bb3c94c38788b2e42fc107a10c03f723a2ad95d;hpb=108d257a16859898f5ce02f4759c5c58f9b8c050;p=mesa.git

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 1bb3c94c387..2e9d380c0b4 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gbm = include_directories('.', 'backends/dri')
+inc_gbm = include_directories('.', 'main', 'backends/dri')
 
 files_gbm = files(
   'main/backend.c',
@@ -29,32 +29,31 @@ files_gbm = files(
 )
 deps_gbm = []
 args_gbm = []
-links_gbm = []
 deps_gbm = []
+incs_gbm = [
+  include_directories('main'), inc_include, inc_src, inc_loader,
+  inc_wayland_drm,
+]
 
 if with_dri2
   files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
-  deps_gbm += [dep_libdrm, dep_thread]
-  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir)
+  deps_gbm += dep_libdrm # TODO: pthread-stubs
+  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path)
 endif
 if with_platform_wayland
   deps_gbm += dep_wayland_server
-  links_gbm += libwayland_drm
+  incs_gbm += inc_wayland_drm
 endif
 
-# TODO: wayland support (requires egl)
-
 libgbm = shared_library(
   'gbm',
   files_gbm,
-  include_directories : [
-    include_directories('main'), inc_include, inc_src, inc_loader,
-    include_directories('../egl/wayland/wayland-drm')],
-  c_args : args_gbm,
+  include_directories : incs_gbm,
+  c_args : [c_vis_args, args_gbm],
   link_args : [ld_args_gc_sections],
-  link_with : [links_gbm, libloader, libmesa_util, libxmlconfig],
-  dependencies : [deps_gbm, dep_dl],
-  version : '1.0',
+  link_with : [libloader, libmesa_util, libxmlconfig],
+  dependencies : [deps_gbm, dep_dl, dep_thread],
+  version : '1.0.0',
   install : true,
 )
 
@@ -70,6 +69,10 @@ pkg.generate(
 )
 
 if with_tests
-  gbm_symbols_check = find_program('gbm-symbols-check')
-  test('gbm-symbols-check', gbm_symbols_check)
+  test(
+    'gbm-symbols-check',
+    find_program('gbm-symbols-check'),
+    env : env_test,
+    args : libgbm
+  )
 endif