summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/r600
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/winsys/r600')
-rw-r--r--src/gallium/winsys/r600/drm/Android.mk4
-rw-r--r--src/gallium/winsys/r600/drm/Makefile1
-rw-r--r--src/gallium/winsys/r600/drm/SConscript2
3 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/winsys/r600/drm/Android.mk b/src/gallium/winsys/r600/drm/Android.mk
index eb79caa19ca..b1c0ab684bb 100644
--- a/src/gallium/winsys/r600/drm/Android.mk
+++ b/src/gallium/winsys/r600/drm/Android.mk
@@ -33,9 +33,7 @@ LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_CFLAGS := -std=c99
LOCAL_C_INCLUDES := \
- $(GALLIUM_TOP)/drivers/r600 \
- $(DRM_TOP) \
- $(DRM_TOP)/include/drm
+ $(GALLIUM_TOP)/drivers/r600
LOCAL_MODULE := libmesa_winsys_r600
diff --git a/src/gallium/winsys/r600/drm/Makefile b/src/gallium/winsys/r600/drm/Makefile
index c23286c8197..ccaab0b4170 100644
--- a/src/gallium/winsys/r600/drm/Makefile
+++ b/src/gallium/winsys/r600/drm/Makefile
@@ -9,7 +9,6 @@ include Makefile.sources
LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r600 \
-I$(TOP)/include \
- $(shell pkg-config libdrm --cflags-only-I)
include ../../../Makefile.template
diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript
index 2d0d80e8bb9..cbefd25e289 100644
--- a/src/gallium/winsys/r600/drm/SConscript
+++ b/src/gallium/winsys/r600/drm/SConscript
@@ -4,8 +4,6 @@ env = env.Clone()
r600_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-env.PkgUseModules('DRM_RADEON')
-
env.Append(CPPPATH = '#/src/gallium/drivers/r600')
r600winsys = env.ConvenienceLibrary(