diff options
| -rw-r--r-- | src/mesa/Android.mesa_gen_matypes.mk | 48 | ||||
| -rw-r--r-- | src/mesa/Android.mk | 19 |
2 files changed, 50 insertions, 17 deletions
diff --git a/src/mesa/Android.mesa_gen_matypes.mk b/src/mesa/Android.mesa_gen_matypes.mk new file mode 100644 index 00000000000..6e301f90416 --- /dev/null +++ b/src/mesa/Android.mesa_gen_matypes.mk @@ -0,0 +1,48 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <[email protected]> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# --------------------------------------------------------------------- +# host executable: mesa_gen_matypes +# --------------------------------------------------------------------- + +ifeq ($(strip $(MESA_ENABLE_ASM)),true) +ifeq ($(TARGET_ARCH),x86) + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := mesa_gen_matypes +LOCAL_IS_HOST_MODULE := true + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/glsl + +LOCAL_SRC_FILES := \ + x86/gen_matypes.c + +include $(MESA_COMMON_MK) +include $(BUILD_HOST_EXECUTABLE) + +endif # x86 +endif # MESA_ENABLE_ASM diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index dad2b9a6cf1..d57323507bd 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -37,25 +37,9 @@ common_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/glsl -common_ASM := - -# --------------------------------------- -# Build mesa_gen_matypes for host -# --------------------------------------- - ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) -common_ASM += $(X86_FILES) - -include $(CLEAR_VARS) -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) - +common_ASM := $(X86_FILES) endif # x86 endif # MESA_ENABLE_ASM @@ -113,4 +97,5 @@ include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_CLASSIC +include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk |