summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-05-17 11:52:26 -0700
committerDylan Baker <[email protected]>2019-10-10 16:33:04 -0700
commite3f5c3232cbfd724682d3df27d83587383969d86 (patch)
tree461f377335a73275cf11bc8d948f42b930d81bee /src
parent474d6f8e08a1363d6e0766fb59b8a64525ae2aec (diff)
meson: fix pipe-loader compilation for windows
v2: - Add missing D to pound define - Simply define the variable rather than set it to 1 (mirrors android.mk not scons) Acked-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/pipe-loader/meson.build7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 0e4b1ded5c5..d1888162a42 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -27,9 +27,11 @@ files_pipe_loader = files(
)
libpipe_loader_defines = []
+libpipe_loader_links = []
if dep_libdrm.found()
files_pipe_loader += files('pipe_loader_drm.c')
+ libpipe_loader_links += libloader
endif
if with_dri
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
@@ -37,6 +39,9 @@ endif
if with_gallium_drisw_kms
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
endif
+if not (with_gallium_st_nine or with_gallium_opencl)
+ libpipe_loader_defines += '-DDROP_PIPE_LOADER_MISC'
+endif
libpipe_loader_static = static_library(
'pipe_loader_static',
@@ -64,7 +69,7 @@ libpipe_loader_dynamic = static_library(
join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
)
],
- link_with : libloader,
+ link_with : [libpipe_loader_links],
dependencies : [dep_libdrm, idep_xmlconfig],
build_by_default : false,
)