diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-30 23:26:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-30 23:29:47 +0200 |
| commit | 055e5645a789d2822d3c4e5a3bc81ff6a969ff31 (patch) | |
| tree | 8a923f19c3586f9341114be6c81784ab9018aef8 /mesalib/src/glsl/Android.mk | |
| parent | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (diff) | |
| parent | a71d524ecad48837e0124a03124bc05f59a48be7 (diff) | |
| download | vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.tar.gz vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.tar.bz2 vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/Android.mk')
| -rw-r--r-- | mesalib/src/glsl/Android.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk index 38c2087a4..f20741e0d 100644 --- a/mesalib/src/glsl/Android.mk +++ b/mesalib/src/glsl/Android.mk @@ -35,12 +35,14 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ - $(LIBGLSL_FILES) + $(LIBGLSL_FILES) \ + $(NIR_FILES) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary LOCAL_MODULE := libmesa_glsl @@ -59,9 +61,10 @@ LOCAL_SRC_FILES := \ $(GLSL_COMPILER_CXX_FILES) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util |