X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fpanfrost%2Fmeson.build;h=46605165d060620809a1af763a93215340fa8c53;hb=529f79d639dfe6ba325b04edd78cecd5cbbf55cc;hp=435c64d354adf2c3969fc2c00af851aeba5737e7;hpb=d2d85b950d78c553b2694cda9ef0cc7bf9a0f737;p=mesa.git

diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 435c64d354a..46605165d06 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -24,57 +24,46 @@ inc_panfrost_hw = include_directories([
 ])
 
 inc_panfrost = include_directories([
-   '.', 'include', 'shared', 'midgard', 'bifrost'
+   '.', 'include', 'shared', 'midgard', 'bifrost', 'lib'
 ])
 
 subdir('shared')
+subdir('util')
 subdir('midgard')
 subdir('bifrost')
-subdir('pandecode')
-
-files_pandecode = files(
-  'pandecode/cmdline.c',
-  'pandecode/common.c',
-  'pandecode/decode.c',
-  'pandecode/pan_pretty_print.c',
-
-  'midgard/disassemble.c',
-  'midgard/midgard_ops.c',
-  'bifrost/disassemble.c',
-)
-
-pandecode = executable(
-  'pandecoder',
-  files_pandecode,
-  include_directories : [inc_common, inc_include, inc_src, inc_panfrost],
-  dependencies : [
-    dep_thread,
-    idep_mesautil,
-  ],
-  build_by_default : true
-)
+subdir('lib')
 
 files_bifrost = files(
   'bifrost/cmdline.c',
+  'bifrost/test/bi_submit.c',
+  'bifrost/test/bi_interpret.c',
+  'bifrost/test/bi_test_pack.c',
 )
 
 bifrost_compiler = executable(
   'bifrost_compiler',
-  [files_bifrost],
+  [files_bifrost, midgard_pack],
   include_directories : [
-    inc_common,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
     inc_include,
     inc_src,
     inc_panfrost,
+    inc_panfrost_hw,
  ],
   dependencies : [
-    dep_thread,
     idep_nir,
     idep_mesautil,
+    dep_libdrm,
   ],
   link_with : [
     libglsl_standalone,
-    libpanfrost_bifrost
+    libpanfrost_bifrost,
+    libpanfrost_decode,
+    libpanfrost_lib,
+    libpanfrost_midgard_disasm, # references disassemble_midgard...
   ],
-  build_by_default : true
+  build_by_default : with_tools.contains('panfrost')
 )