diff options
author | Tomasz Figa <[email protected]> | 2014-09-27 16:19:59 +0200 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-10-03 01:25:28 +0100 |
commit | d703abf735bc2fe27af893d07e44598b8601b172 (patch) | |
tree | 85a582f9ac5105add9326c027366c47f361755e1 /src/util | |
parent | 493bfa54a57e2feddd887ba0ec3d5ef139e82f3b (diff) |
util: Include in Android builds
This patch fixes Android build failures by including src/util directory
in compilation. Files inside of this directory are compiled into
libmesa_util static library and linked with resulting libGLES_mesa.
Signed-off-by: Tomasz Figa <[email protected]>
CC: <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Android.mk | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/src/util/Android.mk b/src/util/Android.mk new file mode 100644 index 00000000000..6b38cf9afb2 --- /dev/null +++ b/src/util/Android.mk @@ -0,0 +1,102 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2014 Tomasz Figa <[email protected]> +# +# 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. + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/Makefile.sources + +# --------------------------------------- +# Build libmesa_util +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(MESA_UTIL_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src + +LOCAL_MODULE := libmesa_util + +# Generated sources + +ifeq ($(LOCAL_MODULE_CLASS),) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +endif + +intermediates := $(call local-intermediates-dir) + +# This is the list of auto-generated files: sources and headers +sources := $(addprefix $(intermediates)/, $(MESA_UTIL_GENERATED_FILES)) + +LOCAL_GENERATED_SOURCES += $(sources) + +FORMAT_SRGB := $(LOCAL_PATH)/format_srgb.py + +$(intermediates)/format_srgb.c: $(FORMAT_SRGB) + @$(MESA_PYTHON2) $(FORMAT_SRGB) $< > $@ + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# Build host libmesa_util +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_IS_HOST_MODULE := true +LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L + +LOCAL_SRC_FILES := \ + $(MESA_UTIL_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src + +LOCAL_MODULE := libmesa_util + +# Generated sources + +ifeq ($(LOCAL_MODULE_CLASS),) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +endif + +intermediates := $(call local-intermediates-dir) + +# This is the list of auto-generated files: sources and headers +sources := $(addprefix $(intermediates)/, $(MESA_UTIL_GENERATED_FILES)) + +LOCAL_GENERATED_SOURCES += $(sources) + +FORMAT_SRGB := $(LOCAL_PATH)/format_srgb.py + +$(intermediates)/format_srgb.c: $(FORMAT_SRGB) + @$(MESA_PYTHON2) $(FORMAT_SRGB) $< > $@ + +include $(MESA_COMMON_MK) +include $(BUILD_HOST_STATIC_LIBRARY) |