-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/26/2011 10:43 PM, Chia-I Wu wrote: > On Sat, Aug 27, 2011 at 9:54 AM, Chad Versace <c...@chad-versace.us> wrote: >> libmesa_dri_common is a static library that contains the sources in >> src/mesa/drivers/dri/common. Each DRI driver should link to it. >> >> Signed-off-by: Chad Versace <c...@chad-versace.us> >> --- >> Android.mk | 1 + >> src/mesa/drivers/dri/common/Android.mk | 49 >> ++++++++++++++++++++++++++++++++ >> 2 files changed, 50 insertions(+), 0 deletions(-) >> create mode 100644 src/mesa/drivers/dri/common/Android.mk >> >> diff --git a/Android.mk b/Android.mk >> index 53c619e..ab1778e 100644 >> --- a/Android.mk >> +++ b/Android.mk >> @@ -74,6 +74,7 @@ SUBDIRS := \ >> src/mapi \ >> src/glsl \ >> src/mesa \ >> + src/mesa/drivers/dri/common \ >> src/egl/main > This should be > > ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) > SUBDIRS += src/mesa/drivers/dri/common > endif > > It makes it easier to tell that src/mesa/drivers/dri/common is not > needed for Gallium.
Will do. > >> ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) >> diff --git a/src/mesa/drivers/dri/common/Android.mk >> b/src/mesa/drivers/dri/common/Android.mk >> new file mode 100644 >> index 0000000..93982cc >> --- /dev/null >> +++ b/src/mesa/drivers/dri/common/Android.mk >> @@ -0,0 +1,49 @@ >> +# >> +# Copyright (C) 2011 Intel Corporation >> +# >> +# 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) >> + >> +# Import variables mesa_dri_common_*. >> +include $(LOCAL_PATH)/Makefile.sources >> + >> +#----------------------------------------------- >> +# Build libmesa_dri_common >> +#----------------------------------------------- >> + >> +ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) > This check can be removed with the change to top-level Android.mk. Right. >> + >> +include $(CLEAR_VARS) >> +LOCAL_MODULE := libmesa_dri_common >> + >> +LOCAL_C_INCLUDES := \ >> + $(mesa_dri_common_INCLUDES) \ >> + $(DRM_TOP) \ >> + $(DRM_TOP)/include/drm \ >> + external/expat/lib >> + >> +LOCAL_SRC_FILES := \ >> + $(mesa_dri_common_SOURCES) >> + >> +include $(MESA_COMMON_MK) >> +include $(BUILD_STATIC_LIBRARY) >> + >> +endif # MESA_BUILD_CLASSIC >> -- >> 1.7.6 - -- Chad Versace c...@chad-versace.us -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJOWmLLAAoJEAIvNt057x8iVNcQAIreXseS9ffE0tqoFpE1FAEO LmIj02fWHDdkFcTX4xjHd9njqU0NzcjDRzRnL6T1DsL6d3yxomOr6WgFZcQGa5D6 uRUwkzbB5YcaAMz0Ol3VkmMEv4mgqcQHtRfl/uJbKp1PVxQum46PT2HXDKV5lpl8 j6NQFV8uMwqFa5GdHwmB8ndGYYWtgEBMpxYrA+etdYWeIgTf3l1a4aScC//AGyFj vNq2CBOvB6C8ciZclQYcFQ9TzRiYiEefNCpLlYhsPiZeEU5H0/p7DKWC0J50BGCh /C8wV5hVaLMKsnNuAgfrBdxQgAs4zU5iJsHQbfQZ94IZK3PvP7ITFWXNEm8HiQpO vKHIPbb9LyAszUkV6dQ3uJWihCR1NQZYHL/lsFG4TKablIXcIwPsN8KOUXb3RvOX hS1wZsFAXPZ7XqJM70hLR9jzE57QmpwK/6xZEu9s8gQ+DwJGyUnklErGD6wVmG0w L6OUJ7Pc1yeyROjru1Xt9cKhLt8SmcKpzUfgagxsNX9E5Nsv1rB7FPYX9TIXlG8A /Kb2LTb1ZRJhu8d970gVhfjxGksLQoWfySciJ53wNKLyNpnrs8JlqiPekuUCxgCy qd8b1JSYglgT+YRlDIiSeg8zh9JcNV/+fOPcBeG8E0kaaka21g3/y0S0a+N6Do4O 27fG4Ok7aIxQmKOSgCQA =W7fk -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
