aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/Android.mk
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-14 15:13:52 +0100
committermarha <marha@users.sourceforge.net>2013-01-14 15:13:52 +0100
commit2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (patch)
tree721982dda954c217323cf726bf1ff527b0477ebe /mesalib/src/mesa/drivers/dri/Android.mk
parentddc05759f098f06bd93253a7bffe38640963dfb3 (diff)
downloadvcxsrv-2a1abdc8fe640583dac90dc316caf2d40b9ee4e2.tar.gz
vcxsrv-2a1abdc8fe640583dac90dc316caf2d40b9ee4e2.tar.bz2
vcxsrv-2a1abdc8fe640583dac90dc316caf2d40b9ee4e2.zip
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale
xkeyboard-config git update 14 jan 2013 libxtrans: ec3136232f7ce930f9ca812b6ab42a71b60af4af xwininfo: 3e60a26559221e561770710a8c4ed0b8ebc31afb libX11: 3cd974b1d4d1fa6389d3695fa9fcc0c22a51d50c libXau: 8570d287396934f26224c76d48d7f17d87380e72 libXmu: 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528 libXdmcp: ca65a92405500393f09d34388edbbf6350e6c146 mesa: e3e1ffb2520498584ef402213d0c8aa4303a46a3 mkfontscale: 1157b3039551b552b483f05f6a411e57941a87c0
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/Android.mk')
-rw-r--r--mesalib/src/mesa/drivers/dri/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Android.mk b/mesalib/src/mesa/drivers/dri/Android.mk
index d6196bb43..88629531a 100644
--- a/mesalib/src/mesa/drivers/dri/Android.mk
+++ b/mesalib/src/mesa/drivers/dri/Android.mk
@@ -38,6 +38,7 @@ MESA_DRI_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
MESA_DRI_C_INCLUDES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
$(DRM_TOP) \
$(DRM_TOP)/include/drm \
@@ -56,6 +57,9 @@ MESA_DRI_SHARED_LIBRARIES := \
libglapi \
liblog
+# All DRI modules must add this to LOCAL_GENERATED_SOURCES.
+MESA_DRI_OPTIONS_H := $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common)/xmlpool/options.h
+
#-----------------------------------------------
# Build drivers and libmesa_dri_common