diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-05-16 02:04:14 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-05 12:32:35 +0200 |
| commit | 1ccadd564b260c00020115768bff884fae2f4331 (patch) | |
| tree | 82dca2a58bda54ed2acc3078fbf0457b5450c3a5 | |
| parent | ae83203d53676557022656d4903eb89505dc7abd (diff) | |
gallium/targets: link against NIR when building radeonsi
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/gallium/drivers/radeonsi/Automake.inc | 3 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/omx/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/va/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc index 1bc7b93f8c..6f1843a3c6 100644 --- a/src/gallium/drivers/radeonsi/Automake.inc +++ b/src/gallium/drivers/radeonsi/Automake.inc @@ -8,6 +8,9 @@ TARGET_LIB_DEPS += \ $(LIBDRM_LIBS) \ $(AMDGPU_LIBS) +TARGET_COMPILER_LIB_DEPS = \ + $(top_builddir)/src/compiler/nir/libnir.la + TARGET_RADEON_WINSYS = \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index 7a783f4371..8f2a6f5601 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -103,6 +103,7 @@ d3dadapter9_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 928e0182a6..d977255fcf 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -59,6 +59,7 @@ libomx_mesa_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index 3fcc88e06c..453a1c3254 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -58,6 +58,7 @@ gallium_drv_video_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 26340f114a..c1cd59621e 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -64,6 +64,7 @@ libvdpau_gallium_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 6937850adb..9f82d2605e 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -53,6 +53,7 @@ libXvMCgallium_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(TARGET_LIB_DEPS) \ + $(TARGET_COMPILER_LIB_DEPS) \ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS |