diff options
| author | Chia-I Wu <olv@lunarg.com> | 2011-08-31 12:31:59 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2011-09-01 10:53:30 +0800 |
| commit | 05fdb44dd7f2f4500e3d159df6519a644b5f09bc (patch) | |
| tree | caacdb83eb2f8f221a83e0a94adfce9b16f5a63f | |
| parent | 488fe51cf823ccd137c667f1e92dd86f8323b723 (diff) | |
i965: fix Android build
Use $(TARGET_CC) instead of $(CC). Correctly name and set LOCAL_CFLAGS.
Reviewed-by: Chad Versace <chad@chad-versace.us>
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index b8ccd0c1b2..67f656b78a 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -31,6 +31,11 @@ include $(LOCAL_PATH)/common/Makefile.sources MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri +MESA_DRI_CFLAGS := \ + -DFEATURE_GL=1 \ + -DFEATURE_ES1=1 \ + -DFEATURE_ES2=1 + MESA_DRI_C_INCLUDES := \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ $(DRM_TOP) \ diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 2a289ddcd9..3f49c8b176 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -34,11 +34,10 @@ include $(LOCAL_PATH)/Makefile.sources # Overriding LOCAL_CC below is an ugly workaround. We cannot place -std=c99 # in LOCAL_C_FLAGS because Android appends LOCAL_C_FLAGS to LOCAL_CPP_FLAGS. -LOCAL_CC := $(CC) -std=c99 +LOCAL_CC := $(TARGET_CC) -std=c99 -LOCAL_C_FLAGS := \ - $(MESA_DRI_C_FLAGS) \ - -DI965 +LOCAL_CFLAGS := \ + $(MESA_DRI_CFLAGS) LOCAL_C_INCLUDES := \ $(i965_INCLUDES) \ |