X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.common.mk;h=d0a5f1aa413164fc03aa156c71bb2c0888afca4f;hb=d53901c67c7df914fbc5279f25d0e725c479bab0;hp=83177a0cbe7ccc87199f6f0c37da7281677d0593;hpb=f8e6d19f3f40931be741b44d3edf210c38e13f0f;p=mesa.git

diff --git a/Android.common.mk b/Android.common.mk
index 83177a0cbe7..d0a5f1aa413 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,18 +21,33 @@
 # 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
 
+# define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
-	-DPTHREADS \
+	-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
+
+LOCAL_CFLAGS += \
+	-DHAVE_PTHREAD=1 \
 	-fvisibility=hidden \
 	-Wno-sign-compare
 
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-	-DUSE_X86_ASM
+	-DUSE_X86_ASM \
+	-DHAVE_DLOPEN \
+
 endif
 endif