diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-07-20 21:18:34 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-13 00:46:52 +0100 |
| commit | 6b510c63383a421eabe0d6e7b0249dbab85cffde (patch) | |
| tree | 937065d69efb3ae7085b49d8b5cc0ffb6784a21e | |
| parent | b26017fad82af73b91da1e132256e8304bb60c4d (diff) | |
| download | external_mesa3d-6b510c63383a421eabe0d6e7b0249dbab85cffde.zip external_mesa3d-6b510c63383a421eabe0d6e7b0249dbab85cffde.tar.gz external_mesa3d-6b510c63383a421eabe0d6e7b0249dbab85cffde.tar.bz2 | |
android: gallium/nouveau: fix include folders, link against libstlport
nouveau uses STL for a while now thus we need to include
external/stlport/libstlport.mk in order to get the build
at least partially working.
v2: Use the installed libdrm headers over the DRM_TOP ones.
Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | src/gallium/drivers/nouveau/Android.mk | 9 | ||||
| -rw-r--r-- | src/gallium/winsys/nouveau/drm/Android.mk | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk index 5275aa6..5870aa0 100644 --- a/src/gallium/drivers/nouveau/Android.mk +++ b/src/gallium/drivers/nouveau/Android.mk @@ -28,18 +28,19 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(C_SOURCES) \ +LOCAL_SRC_FILES := \ + $(C_SOURCES) \ $(NV30_C_SOURCES) \ $(NV50_CODEGEN_SOURCES) \ $(NV50_C_SOURES) \ $(NVC0_CODEGEN_SOURCES) \ $(NVC0_C_SOURCES) -LOCAL_C_INCLUDES := $(DRM_TOP) \ - $(DRM_TOP)/include/drm \ - $(DRM_TOP)/nouveau +LOCAL_C_INCLUDES := \ + $(TARGET_OUT_HEADERS)/libdrm LOCAL_MODULE := libmesa_pipe_nouveau +include external/stlport/libstlport.mk include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/nouveau/drm/Android.mk b/src/gallium/winsys/nouveau/drm/Android.mk index 2e2a9d1..142cc6b 100644 --- a/src/gallium/winsys/nouveau/drm/Android.mk +++ b/src/gallium/winsys/nouveau/drm/Android.mk @@ -30,10 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := \ - $(DRM_TOP) \ - $(DRM_TOP)/include/drm \ - $(DRM_TOP)/nouveau +LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm LOCAL_MODULE := libmesa_winsys_nouveau |