diff options
| author | Chia-I Wu <[email protected]> | 2011-11-26 11:20:05 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-11-26 11:42:08 +0800 |
| commit | d2cd621086fdf620a96d599bac0873ff58ddf137 (patch) | |
| tree | 125fdc97a1ae29408d82936bd7356109545c350e /src/mesa | |
| parent | 4d3d6f76ff165ca92544432ca512c9652cab9110 (diff) | |
android: pass -std=c99 by default
Several modules expect a C99 compiler already. It is also the default for
Makefile build.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.mk | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Android.mk | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index f21ba3aa0d6..f6c0f4e33d2 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -56,6 +56,7 @@ LOCAL_SRC_FILES := x86/gen_matypes.c LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_MODULE := mesa_gen_matypes +LOCAL_IS_HOST_MODULE := true include $(MESA_COMMON_MK) include $(BUILD_HOST_EXECUTABLE) @@ -145,6 +146,7 @@ LOCAL_SRC_FILES := \ program/symbol_table.c LOCAL_MODULE := libmesa_glsl_utils +LOCAL_IS_HOST_MODULE := true include $(MESA_COMMON_MK) include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index 21b3450b84f..b615e9b753d 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) # Import variables i915_*. 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 := $(TARGET_CC) -std=c99 - LOCAL_CFLAGS := \ $(MESA_DRI_CFLAGS) \ -DI915 diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 3f49c8b1761..ec4a7613099 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) # Import variables i965_*. 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 := $(TARGET_CC) -std=c99 - LOCAL_CFLAGS := \ $(MESA_DRI_CFLAGS) |