From 04cdca530b48a70db4c18eafad001824ea2ab1d2 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 26 Jul 2012 17:42:19 +0200
Subject: [PATCH] Add Android.mk that generates a static library, for
 convenience.

---
 Android.mk            | 60 +++++++++++++++++++++++++++++++++++++++++++
 ext/libzip/Android.mk |  1 +
 gfx/texture.cpp       |  5 ----
 3 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000000..e602aa0971
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,60 @@
+# Basic Android.mk for libnative
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := libnative
+LOCAL_SRC_FILES :=\
+    android/app-android.cpp \
+    android/native_audio.cpp \
+    audio/wav_read.cpp \
+    audio/mixer.cpp.arm \
+    base/buffer.cpp \
+    base/display.cpp \
+    base/timeutil.cpp \
+    base/colorutil.cpp \
+    base/error_context.cpp \
+    base/stringutil.cpp \
+    ext/sha1/sha1.cpp \
+    ext/stb_vorbis/stb_vorbis.c.arm \
+    ext/vjson/json.cpp \
+    ext/vjson/block_allocator.cpp \
+    file/dialog.cpp \
+    file/fd_util.cpp \
+    file/easy_file.cpp \
+    file/chunk_file.cpp \
+    file/file_util.cpp \
+    file/zip_read.cpp \
+    json/json_writer.cpp \
+    math/math_util.cpp.arm \
+    math/lin/aabb.cpp.arm \
+    math/lin/plane.cpp.arm \
+    math/lin/quat.cpp.arm \
+    math/lin/vec3.cpp.arm \
+    math/lin/matrix4x4.cpp.arm \
+    midi/midi_input.cpp \
+    net/http_client.cpp \
+    net/resolve.cpp \
+    profiler/profiler.cpp \
+    gfx_es2/glsl_program.cpp \
+    gfx_es2/draw_buffer.cpp.arm \
+    gfx_es2/vertex_format.cpp \
+    gfx/gl_debug_log.cpp \
+    gfx/gl_lost_manager.cpp \
+    gfx/texture.cpp \
+    gfx/texture_atlas.cpp \
+    gfx/texture_gen.cpp \
+    image/zim_load.cpp \
+	ui/ui.cpp \
+	ui/screen.cpp \
+    util/random/perlin.cpp
+
+
+LOCAL_CFLAGS := -O2 -DANDROID_NDK -DUSE_GLES2 
+LOCAL_CPPFLAGS := -fno-exceptions -fno-rtti -std=gnu++0x
+LOCAL_LDLIBS := -lz
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext/libzip
+
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ext/libzip/Android.mk b/ext/libzip/Android.mk
index 34d8074f77..8973e1aaef 100644
--- a/ext/libzip/Android.mk
+++ b/ext/libzip/Android.mk
@@ -72,6 +72,7 @@ LOCAL_SRC_FILES :=\
 	zip_unchange_archive.c \
 	zip_unchange_data.c
 
+LOCAL_CFLAGS := -O2
 LOCAL_LDLIBS := -lz
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/gfx/texture.cpp b/gfx/texture.cpp
index 62ebc8a681..d0724e4f60 100644
--- a/gfx/texture.cpp
+++ b/gfx/texture.cpp
@@ -1,12 +1,7 @@
 #ifdef ANDROID
-#ifdef USE_GLES2
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #else
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#endif
-#else
 #include <GL/glew.h>
 #if defined(__APPLE__)
 #include <OpenGL/gl.h>