diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
| commit | fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817 (patch) | |
| tree | bcc60a76e7cc205710b91c67ff700c26886ea3e8 /mesalib/src/gallium/auxiliary/Android.mk | |
| parent | 393178cdbca247c6ad077f7dab9a97d6817c625c (diff) | |
| parent | fdef5bff99e6079f64bc6b91c91b42195c85adeb (diff) | |
| download | vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.gz vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.bz2 vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/Android.mk')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/Android.mk b/mesalib/src/gallium/auxiliary/Android.mk index 0c37dd31a..11fc2256a 100644 --- a/mesalib/src/gallium/auxiliary/Android.mk +++ b/mesalib/src/gallium/auxiliary/Android.mk @@ -44,8 +44,7 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ $(intermediates)/indices/u_indices_gen.c \ $(intermediates)/indices/u_unfilled_gen.c \ -$(intermediates)/util/u_format_srgb.c \ -$(intermediates)/util/u_half.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py +$(intermediates)/util/u_format_srgb.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(transform-generated-source) $(intermediates)/util/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/util/u_format.csv |