aboutsummaryrefslogtreecommitdiff
path: root/mesalib/Android.common.mk
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-28 08:38:39 +0100
committermarha <marha@users.sourceforge.net>2011-11-28 08:38:39 +0100
commit22fb212bb84a69ab20a494aed1c197da1d2dbdf7 (patch)
treed11c21c9260bee0f56c34ee6e241671befd5257f /mesalib/Android.common.mk
parentc1296df0ebe19a8e90fb7d7f0135d7034f16a76d (diff)
parent7417e9a171736b5279881cd4381fb58c617a23d9 (diff)
downloadvcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.gz
vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.bz2
vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/Android.common.mk')
-rw-r--r--mesalib/Android.common.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/Android.common.mk b/mesalib/Android.common.mk
index f28ddc2ef..e8b900697 100644
--- a/mesalib/Android.common.mk
+++ b/mesalib/Android.common.mk
@@ -21,6 +21,15 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
+# use c99 compiler by default
+ifeq ($(LOCAL_CC),)
+ifeq ($(LOCAL_IS_HOST_MODULE),true)
+LOCAL_CC := $(HOST_CC) -std=c99
+else
+LOCAL_CC := $(TARGET_CC) -std=c99
+endif
+endif
+
LOCAL_C_INCLUDES += \
$(MESA_TOP)/include