From c4b6067eeb5434bcba7547f2ac53e5499f91dcd5 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 21 Mar 2013 22:50:24 +0100
Subject: [PATCH] Attempt at android build fix on the build server (old ndk?)

---
 Android.mk          | 8 +++++++-
 net/http_client.cpp | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index dc7b665d1f..d7a64e92eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,17 +59,23 @@ LOCAL_SRC_FILES :=\
     util/random/perlin.cpp \
     util/text/utf8.cpp
 
-LOCAL_CFLAGS := -O2 -DGL_GLEXT_PROTOTYPES -DARM -DUSING_GLES2 -fsigned-char -fno-strict-aliasing
+LOCAL_CFLAGS := -O3 -DGL_GLEXT_PROTOTYPES -DUSING_GLES2 -fsigned-char -fno-strict-aliasing
 LOCAL_CPPFLAGS := -fno-exceptions -fno-rtti -std=gnu++0x
 LOCAL_LDLIBS := -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext/libzip
 
 #Portable native and separate code on android in future is easy you needs add files 
 #by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS)
+
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 LOCAL_SRC_FILES += math/math_util.cpp 
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
 LOCAL_SRC_FILES += math/math_utilarmv6.cpp 
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM
+else ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_SRC_FILES += math/math_util.cpp 
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
 endif
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/net/http_client.cpp b/net/http_client.cpp
index 882861eb7f..8c2964693a 100644
--- a/net/http_client.cpp
+++ b/net/http_client.cpp
@@ -3,6 +3,7 @@
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <sys/socket.h>
+#include <sys/endian.h>
 #include <unistd.h>
 #define closesocket close
 #else