mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2024-12-01 14:13:52 +08:00
bfc0c23843
Commit6facb0c0("android: fix libz dynamic library dependencies") unconditionally adds libz as a dependency to all shared libraries. That is unnecessary. Commit85a9b1b5introduced libz as a dependency to libmesa_util. So only the shared libraries that use libmesa_util need libz. Fix Android Lollipop build by adding the include path of zlib to libmesa_util explicitly instead of getting the path implicitly from zlib since it doesn't export the include path in Lollipop. Fixes:6facb0c0"android: fix libz dynamic library dependencies" Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Rob Herring <robh@kernel.org>
106 lines
3.2 KiB
Makefile
106 lines
3.2 KiB
Makefile
# Mesa 3-D graphics library
|
|
#
|
|
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
|
|
# 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.
|
|
|
|
ifeq ($(LOCAL_IS_HOST_MODULE),true)
|
|
LOCAL_CFLAGS += -D_GNU_SOURCE
|
|
endif
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
$(MESA_TOP)/src \
|
|
$(MESA_TOP)/include
|
|
|
|
MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
|
|
LOCAL_CFLAGS += \
|
|
-Wno-unused-parameter \
|
|
-Wno-date-time \
|
|
-Wno-pointer-arith \
|
|
-Wno-missing-field-initializers \
|
|
-Wno-initializer-overrides \
|
|
-Wno-mismatched-tags \
|
|
-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
|
|
-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"
|
|
|
|
# XXX: The following __STDC_*_MACROS defines should not be needed.
|
|
# It's likely due to a bug elsewhere, but let's temporarily add them
|
|
# here to fix the radeonsi build.
|
|
LOCAL_CFLAGS += \
|
|
-DENABLE_SHADER_CACHE \
|
|
-D__STDC_CONSTANT_MACROS \
|
|
-D__STDC_LIMIT_MACROS \
|
|
-DHAVE___BUILTIN_EXPECT \
|
|
-DHAVE___BUILTIN_FFS \
|
|
-DHAVE___BUILTIN_FFSLL \
|
|
-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
|
|
-DHAVE_FUNC_ATTRIBUTE_UNUSED \
|
|
-DHAVE_FUNC_ATTRIBUTE_FORMAT \
|
|
-DHAVE_FUNC_ATTRIBUTE_PACKED \
|
|
-DHAVE_FUNC_ATTRIBUTE_ALIAS \
|
|
-DHAVE___BUILTIN_CTZ \
|
|
-DHAVE___BUILTIN_POPCOUNT \
|
|
-DHAVE___BUILTIN_POPCOUNTLL \
|
|
-DHAVE___BUILTIN_CLZ \
|
|
-DHAVE___BUILTIN_CLZLL \
|
|
-DHAVE___BUILTIN_UNREACHABLE \
|
|
-DHAVE_PTHREAD=1 \
|
|
-DHAVE_DLOPEN \
|
|
-DHAVE_DL_ITERATE_PHDR \
|
|
-fvisibility=hidden \
|
|
-Wno-sign-compare
|
|
|
|
LOCAL_CPPFLAGS += \
|
|
-D__STDC_CONSTANT_MACROS \
|
|
-D__STDC_FORMAT_MACROS \
|
|
-D__STDC_LIMIT_MACROS \
|
|
-Wno-error=non-virtual-dtor \
|
|
-Wno-non-virtual-dtor
|
|
|
|
# mesa requires at least c99 compiler
|
|
LOCAL_CONLYFLAGS += \
|
|
-std=c99
|
|
|
|
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
|
|
ifeq ($(TARGET_ARCH),x86)
|
|
LOCAL_CFLAGS += \
|
|
-DUSE_X86_ASM
|
|
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(LOCAL_IS_HOST_MODULE),true)
|
|
LOCAL_CFLAGS += -DHAVE_LIBDRM
|
|
LOCAL_SHARED_LIBRARIES += libdrm
|
|
endif
|
|
|
|
LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
|
|
LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
|
|
|
|
# uncomment to keep the debug symbols
|
|
#LOCAL_STRIP_MODULE := false
|
|
|
|
ifeq ($(strip $(LOCAL_MODULE_TAGS)),)
|
|
LOCAL_MODULE_TAGS := optional
|
|
endif
|
|
|
|
# Quiet down the build system and remove any .h files from the sources
|
|
LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
|