X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAutomake.inc;h=6fe2e22fecfdc5996aee293f12bfb9fd62030997;hb=bc26e8d4a7c0ebfb84723ddc5ccd2834f434dc70;hp=c43f735c3f372c1eaf573345016d49142a64b2e7;hpb=a131263a2f19507ca0d2f6093672d930a7c054d1;p=mesa.git diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index c43f735c3f3..6fe2e22fecf 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -32,6 +32,7 @@ GALLIUM_DRIVER_CXXFLAGS = \ $(VISIBILITY_CXXFLAGS) GALLIUM_TARGET_CFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/gallium/include \ @@ -50,6 +51,7 @@ GALLIUM_COMMON_LIB_DEPS = \ $(DLOPEN_LIBS) GALLIUM_WINSYS_CFLAGS = \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ @@ -58,16 +60,16 @@ GALLIUM_WINSYS_CFLAGS = \ GALLIUM_PIPE_LOADER_WINSYS_LIBS = \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la + $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ + $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la if HAVE_DRISW GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_WINSYS_XLIB +if HAVE_DRISW_KMS GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ - $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ - -lX11 -lXext -lXfixes \ + $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \ $(LIBDRM_LIBS) endif