blob: e9d15e1837e36222adf0a699de22e705ffa24b92 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 950691e5aec082e4fa69a9a14ba2067c100c7878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 22 Aug 2012 15:10:56 +0200
Subject: [PATCH 2/2] Enable CPU detection on Android
---
configure.ac | 5 +++++
pixman/Makefile.am | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/configure.ac b/configure.ac
index a6bffbe..fe12101 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,8 +514,13 @@ case $host_os in
SSE2_LDFLAGS="$HWCAP_LDFLAGS"
fi
;;
+ linux-android*)
+ is_android="yes"
+ ;;
esac
+AM_CONDITIONAL(IS_ANDROID, test "x$is_android" = "xyes")
+
AC_SUBST(LS_CFLAGS)
AC_SUBST(IWMMXT_CFLAGS)
AC_SUBST(MMX_CFLAGS)
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index b376d9a..aaa6e6f 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -112,6 +112,11 @@ libpixman-iwmmxt.la: libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_DEP
$(AM_V_CCLD)$(libpixman_iwmmxt_la_LINK) libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_LIBADD) $(LIBS)
endif
+if IS_ANDROID
+libpixman_1_la_SOURCES += cpu-features.c
+noinst_HEADERS = cpu-features.h
+endif
+
# mips dspr2 code
if USE_MIPS_DSPR2
noinst_LTLIBRARIES += libpixman-mips-dspr2.la
--
1.9.0
|
