diff options
Diffstat (limited to 'src/mesa/Android.mk')
| -rw-r--r-- | src/mesa/Android.mk | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index 5f1b1341f9..f361aca3e4 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -9,21 +9,23 @@ common_CFLAGS := \ -fvisibility=hidden \ -Wno-sign-compare +ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) +common_CFLAGS += -DFEATURE_GL=1 +endif + common_C_INCLUDES := \ external/mesa/include \ external/mesa/src/mapi \ - external/mesa/src/glsl \ - external/mesa/src/talloc + external/mesa/src/glsl ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(filter-out $(MAIN_ES_SOURCES), $(MESA_GALLIUM_SOURCES)) \ + $(MESA_GALLIUM_SOURCES) \ $(MESA_GALLIUM_CXX_SOURCES) -LOCAL_CFLAGS := \ - $(common_CFLAGS) +LOCAL_CFLAGS := $(common_CFLAGS) LOCAL_C_INCLUDES := \ $(common_C_INCLUDES) \ @@ -31,29 +33,6 @@ LOCAL_C_INCLUDES := \ external/mesa/src/gallium/auxiliary LOCAL_MODULE := libmesa_st_mesa -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -#GEN_SCRIPT := python $(LOCAL_PATH)/main/es_generator.py -#intermediates := $(call local-intermediates-dir) -# -#GEN := $(intermediates)/main/api_exec_es1.c -#$(GEN): PRIVATE_CUSTOM_TOOL = $(GEN_SCRIPT) -S $< -V GLES1.1 > $@ -#$(GEN): $(LOCAL_PATH)/main/APIspec.xml -# $(transform-generated-source) -# -#LOCAL_GENERATED_SOURCES += $(GEN) -# -#GEN := $(intermediates)/main/api_exec_es2.c -#$(GEN): PRIVATE_CUSTOM_TOOL = $(GEN_SCRIPT) -S $< -V GLES2.0 > $@ -#$(GEN): $(LOCAL_PATH)/main/APIspec.xml -# $(transform-generated-source) -# -#LOCAL_GENERATED_SOURCES += $(GEN) -# -#LOCAL_C_INCLUDES += \ -# $(call intermediates-dir-for,SHARED_LIBRARIES,libGLESv1_CM_mesa) \ -# $(call intermediates-dir-for,SHARED_LIBRARIES,libGLESv2_mesa) -LOCAL_SRC_FILES += $(MAIN_ES_SOURCES) include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_GALLIUM @@ -65,12 +44,8 @@ LOCAL_SRC_FILES := \ $(MESA_SOURCES) \ $(MESA_CXX_SOURCES) -LOCAL_CFLAGS := \ - $(common_CFLAGS) \ - -DFEATURE_GL=1 - -LOCAL_C_INCLUDES := \ - $(common_C_INCLUDES) +LOCAL_CFLAGS := $(common_CFLAGS) +LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_MODULE := libmesa_classic_mesa |