diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-30 12:24:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-30 12:24:58 +0200 |
| commit | e4580373a81894c451e5933b24906a075828b77e (patch) | |
| tree | 2e161a4f21301fb9a2ee9955b99d895da85fa7b0 /mesalib/src/mesa/Android.mk | |
| parent | ce592e25d6303a8f4a8aa0e2918e0f72a35bf175 (diff) | |
| download | vcxsrv-e4580373a81894c451e5933b24906a075828b77e.tar.gz vcxsrv-e4580373a81894c451e5933b24906a075828b77e.tar.bz2 vcxsrv-e4580373a81894c451e5933b24906a075828b77e.zip | |
mesa xkeyboard-config git update 30 May 2012
Diffstat (limited to 'mesalib/src/mesa/Android.mk')
| -rw-r--r-- | mesalib/src/mesa/Android.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk index f6c0f4e33..115db4703 100644 --- a/mesalib/src/mesa/Android.mk +++ b/mesalib/src/mesa/Android.mk @@ -26,11 +26,12 @@ LOCAL_PATH := $(call my-dir) # Import the following variables: -# MESA_CXX_SOURCES -# MESA_GALLIUM_CXX_SOURCES -# MESA_GALLIUM_SOURCES -# MESA_SOURCES -# X86_SOURCES +# MESA_CXX_FILES +# MESA_GALLIUM_CXX_FILES +# MESA_GALLIUM_FILES +# MESA_FILES +# X86_FILES +SRCDIR = . include $(LOCAL_PATH)/sources.mak common_CFLAGS := \ @@ -49,7 +50,7 @@ common_ASM := ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) -common_ASM += $(X86_SOURCES) +common_ASM += $(X86_FILES) include $(CLEAR_VARS) LOCAL_SRC_FILES := x86/gen_matypes.c @@ -71,8 +72,8 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(MESA_GALLIUM_SOURCES) \ - $(MESA_GALLIUM_CXX_SOURCES) \ + $(MESA_GALLIUM_FILES) \ + $(MESA_GALLIUM_CXX_FILES) \ $(common_ASM) LOCAL_CFLAGS := $(common_CFLAGS) @@ -108,8 +109,8 @@ LOCAL_C_INCLUDES := \ $(common_C_INCLUDES) LOCAL_SRC_FILES := \ - $(MESA_SOURCES) \ - $(MESA_CXX_SOURCES) \ + $(MESA_FILES) \ + $(MESA_CXX_FILES) \ $(common_ASM) include $(LOCAL_PATH)/Android.gen.mk |