meson: Use include variables

[mesa.git] / src / amd / addrlib / meson.build

diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index a6cad1207b07d40d47ae0a7c23a5f2c652b6b3e6..a7e9dc8c18353b997d65c2bf3c37eff62fce5640 100644 (file)
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -38,11 +38,9 @@ files_addrlib = files(
   'gfx9/coord.h',
   'gfx9/gfx9addrlib.cpp',
   'gfx9/gfx9addrlib.h',
-  'gfx9/rbmap.cpp',
-  'gfx9/rbmap.h',
+  'amdgpu_asic_addr.h',
   'inc/chip/gfx9/gfx9_gb_reg.h',
   'inc/chip/r800/si_gb_reg.h',
-  'inc/lnx_common_defs.h',
   'r800/chip/si_ci_vi_merged_enum.h',
   'r800/ciaddrlib.cpp',
   'r800/ciaddrlib.h',
@@ -55,9 +53,11 @@ files_addrlib = files(
 libamdgpu_addrlib = static_library(
   'addrlib',
   files_addrlib,
-  include_directories : include_directories(
-    'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
-    '../common', '../../'),
-  cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'],
-  build_by_default : false,
+  include_directories : [
+    include_directories(
+      'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
+    ),
+    inc_amd_common, inc_src,
+  ],
+  cpp_args : cpp_vis_args,
 )