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.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.mk')
| -rw-r--r-- | mesalib/src/mesa/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk index 4b62b8194..c32b1c0c1 100644 --- a/mesalib/src/mesa/Android.mk +++ b/mesalib/src/mesa/Android.mk @@ -33,9 +33,7 @@ LOCAL_PATH := $(call my-dir) # X86_FILES include $(LOCAL_PATH)/sources.mak -common_CFLAGS := \ - -DFEATURE_ES1=1 \ - -DFEATURE_ES2=1 +MESA_ENABLED_APIS := ES1 ES2 common_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ @@ -100,9 +98,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_dricore LOCAL_MODULE_CLASS := STATIC_LIBRARIES +MESA_ENABLED_APIS += GL LOCAL_CFLAGS := \ - $(common_CFLAGS) \ - -DFEATURE_GL=1 + $(common_CFLAGS) \ + $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) LOCAL_C_INCLUDES := \ $(common_C_INCLUDES) |