diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
| commit | 112d89481850102f28b6e7ff4f40b65c41e11f6c (patch) | |
| tree | 9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/glsl/Android.mk | |
| parent | bcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff) | |
| parent | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff) | |
| download | vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2 vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/Android.mk')
| -rw-r--r-- | mesalib/src/glsl/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk index 8a3942652..7b1fa7e53 100644 --- a/mesalib/src/glsl/Android.mk +++ b/mesalib/src/glsl/Android.mk @@ -39,12 +39,12 @@ LOCAL_SRC_FILES := \ $(LIBGLSL_FILES) LOCAL_C_INCLUDES := \ - external/astl/include \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa LOCAL_MODULE := libmesa_glsl +include external/stlport/libstlport.mk include $(LOCAL_PATH)/Android.gen.mk include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |