X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.common.mk;h=18e5726fa0ae78d999f6cf67db38d21d9d846592;hb=a666769d3ee25734371b91d5448a0066eab17395;hp=83177a0cbe7ccc87199f6f0c37da7281677d0593;hpb=c9b21d986e6421d57c429f5ba8ca1fc8868e76dc;p=profile%2Fivi%2Fmesa.git

diff --git a/Android.common.mk b/Android.common.mk
index 83177a0..18e5726 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,18 +21,35 @@
 # 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)
+major := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+minor := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 LOCAL_CFLAGS += \
-	-DPTHREADS \
+	-DANDROID_VERSION=0x0$(major)0$(minor)
+
+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