projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into gallium_draw_llvm
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
Makefile
diff --git
a/src/mesa/drivers/dri/i915/Makefile
b/src/mesa/drivers/dri/i915/Makefile
index 37f15aa7671a414975a18c4eb5fe1571af4a51f4..5b49d0c77c6208cb10c8b5c4e10fae959c6db51f 100644
(file)
--- a/
src/mesa/drivers/dri/i915/Makefile
+++ b/
src/mesa/drivers/dri/i915/Makefile
@@
-4,11
+4,8
@@
include $(TOP)/configs/current
LIBNAME = i915_dri.so
LIBNAME = i915_dri.so
-MINIGLX_SOURCES = server/intel_dri.c
-
DRIVER_SOURCES = \
i830_context.c \
DRIVER_SOURCES = \
i830_context.c \
- i830_metaops.c \
i830_state.c \
i830_texblend.c \
i830_texstate.c \
i830_state.c \
i830_texblend.c \
i830_texstate.c \
@@
-34,14
+31,12
@@
DRIVER_SOURCES = \
intel_pixel_read.c \
intel_buffers.c \
intel_blit.c \
intel_pixel_read.c \
intel_buffers.c \
intel_blit.c \
- intel_swapbuffers.c \
i915_tex_layout.c \
i915_texstate.c \
i915_context.c \
i915_debug.c \
i915_debug_fp.c \
i915_fragprog.c \
i915_tex_layout.c \
i915_texstate.c \
i915_context.c \
i915_debug.c \
i915_debug_fp.c \
i915_fragprog.c \
- i915_metaops.c \
i915_program.c \
i915_state.c \
i915_vtbl.c \
i915_program.c \
i915_state.c \
i915_vtbl.c \
@@
-64,7
+59,8
@@
DRIVER_DEFINES = -I../intel -I../intel/server -DI915 \
$(shell pkg-config libdrm --atleast-version=2.3.1 \
&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
$(shell pkg-config libdrm --atleast-version=2.3.1 \
&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
-DRI_LIB_DEPS += -ldrm_intel
+INCLUDES += $(INTEL_CFLAGS)
+DRI_LIB_DEPS += $(INTEL_LIBS)
include ../Makefile.template
include ../Makefile.template