diff options
| author | Marek Olšák <[email protected]> | 2011-09-11 13:28:12 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-09-12 22:03:02 +0200 |
| commit | 85f5d7ceee526a272cb19c2c9d44d6e7aa5d422d (patch) | |
| tree | d1b4905bbabe32a16800a15c1fe69be56ed7f970 /src/gallium/drivers/r600 | |
| parent | fb5995cf53000af3bd32ca6effb4b08c4aaffe17 (diff) | |
r600g: cleanup build include dirs and dependencies
The scons build still depended on libdrm_radeon.
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Makefile | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/SConscript | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 994ae07789c..f060920d5d7 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -32,9 +32,7 @@ LOCAL_SRC_FILES := $(C_SOURCES) LOCAL_CFLAGS := -std=c99 -LOCAL_C_INCLUDES := \ - $(DRM_TOP) \ - $(DRM_TOP)/include/drm +LOCAL_C_INCLUDES := LOCAL_MODULE := libmesa_pipe_r600 diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile index 0e68fe99345..80f8cbfc803 100644 --- a/src/gallium/drivers/r600/Makefile +++ b/src/gallium/drivers/r600/Makefile @@ -3,8 +3,7 @@ include $(TOP)/configs/current LIBNAME = r600 -LIBRARY_INCLUDES = \ - $(shell pkg-config libdrm --cflags-only-I) +LIBRARY_INCLUDES = -I$(TOP)/include # get C_SOURCES include Makefile.sources diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript index be12255e4d0..e400c38b46e 100644 --- a/src/gallium/drivers/r600/SConscript +++ b/src/gallium/drivers/r600/SConscript @@ -2,11 +2,8 @@ Import('*') env = env.Clone() -env.PkgUseModules('DRM_RADEON') - env.Append(CPPPATH = [ '#/include', - '#/src/mesa', ]) r600 = env.ConvenienceLibrary( |