diff options
author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
tree | 932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mesa/Android.gen.mk | |
parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mesa/Android.gen.mk')
-rw-r--r-- | mesalib/src/mesa/Android.gen.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk index c17df1a1e..a8e4f3564 100644 --- a/mesalib/src/mesa/Android.gen.mk +++ b/mesalib/src/mesa/Android.gen.mk @@ -38,7 +38,8 @@ sources := \ program/program_parse.tab.c \ program/lex.yy.c \ main/dispatch.h \ - main/remap_helper.h + main/remap_helper.h \ + main/get_hash.h LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) @@ -146,3 +147,10 @@ $(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/enums.c: $(es_src_deps) $(call es-gen) + +GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py +GET_HASH_GEN_FLAGS := $(patsubst %,-a %,$(MESA_ENABLED_APIS)) + +$(intermediates)/main/get_hash.h: $(glapi)/gl_and_es_API.xml \ + $(LOCAL_PATH)/main/get_hash_params.py $(GET_HASH_GEN) + @$(MESA_PYTHON2) $(GET_HASH_GEN) $(GET_HASH_GEN_FLAGS) -f $< > $@ |