diff options
| author | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
| commit | 213b9004a6ee033a16af3dcd187aa68b56c39858 (patch) | |
| tree | f577f4dc276f70dad63f102f69f87f4d566186ef /src/gallium/targets/egl/Makefile | |
| parent | 6ad846ee78d9d8ba93dcecdefbf89f2b981333ef (diff) | |
| parent | 03615c02d81437cf546609fc6a39c6c73be39360 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'src/gallium/targets/egl/Makefile')
| -rw-r--r-- | src/gallium/targets/egl/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile index de01939e5f1..9d76a706122 100644 --- a/src/gallium/targets/egl/Makefile +++ b/src/gallium/targets/egl/Makefile @@ -48,6 +48,7 @@ egl_LIBS += $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a endif ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) egl_SYS += $(WAYLAND_LIBS) $(LIBDRM_LIB) +egl_LIBS += $(TOP)/src/gallium/winsys/sw/wayland/libws_wayland.a endif ifneq ($(findstring drm, $(EGL_PLATFORMS)),) egl_SYS += $(LIBDRM_LIB) |