i965/gs: Add a case to brwNewProgram() for geometry shaders.

[mesa.git] / src / mesa / drivers / dri / i965 / Android.mk

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 2a289ddcd96d7bb826c8b13463840514d59eedc6..7e3fd65e880a6c061b606e951097f887d9f3a03e 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -32,13 +32,8 @@ 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 := $(CC) -std=c99
-
-LOCAL_C_FLAGS := \
-       $(MESA_DRI_C_FLAGS) \
-       -DI965
+LOCAL_CFLAGS := \
+       $(MESA_DRI_CFLAGS)
 
 LOCAL_C_INCLUDES := \
        $(i965_INCLUDES) \
@@ -46,9 +41,7 @@ LOCAL_C_INCLUDES := \
        $(DRM_TOP)/intel
 
 LOCAL_SRC_FILES := \
-       $(i965_C_SOURCES) \
-       $(i965_CXX_SOURCES) \
-       $(i965_ASM_SOURCES)
+       $(i965_FILES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        $(MESA_DRI_WHOLE_STATIC_LIBRARIES)
@@ -57,5 +50,8 @@ LOCAL_SHARED_LIBRARIES := \
        $(MESA_DRI_SHARED_LIBRARIES) \
        libdrm_intel
 
+LOCAL_GENERATED_SOURCES := \
+       $(MESA_DRI_OPTIONS_H)
+
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)