projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etnaviv: GC7000: Move active_samplers_bits to texture
[mesa.git]
/
src
/
gallium
/
Automake.inc
diff --git
a/src/gallium/Automake.inc
b/src/gallium/Automake.inc
index 95aae50d64b87fedb9957108ea4e53170fccc860..3e21aa71b5ca10c8374a6b95fc462f71e7b9a8b5 100644
(file)
--- a/
src/gallium/Automake.inc
+++ b/
src/gallium/Automake.inc
@@
-39,6
+39,8
@@
GALLIUM_TARGET_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
+ -I$(top_builddir)/src/util/ \
+ -I$(top_builddir)/src/gallium/drivers/ \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS) \
@@
-46,10
+48,17
@@
GALLIUM_TARGET_CFLAGS = \
GALLIUM_COMMON_LIB_DEPS = \
-lm \
GALLIUM_COMMON_LIB_DEPS = \
-lm \
+ $(LIBUNWIND_LIBS) \
+ $(LIBSENSORS_LIBS) \
$(CLOCK_LIB) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS)
$(CLOCK_LIB) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS)
+if HAVE_LIBDRM
+GALLIUM_COMMON_LIB_DEPS += \
+ $(LIBDRM_LIBS)
+endif
+
GALLIUM_WINSYS_CFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
GALLIUM_WINSYS_CFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
@@
-68,9
+77,8
@@
GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
endif
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
endif
-if
NEED_WINSYS_XLIB
+if
HAVE_DRISW_KMS
GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
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
$(LIBDRM_LIBS)
endif