From d0f866e4b0e133133fe3205d3f7f8935801b4cf1 Mon Sep 17 00:00:00 2001
From: fysx <martin@fysx.org>
Date: Thu, 22 Jan 2015 20:57:57 +0100
Subject: [PATCH] fixed build for latest love-android version

---
 jni/love/Android.mk   |  1 +
 jni/love/src/love.cpp | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jni/love/Android.mk b/jni/love/Android.mk
index 97962239..b1ecc629 100644
--- a/jni/love/Android.mk
+++ b/jni/love/Android.mk
@@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \
   $(wildcard ${LOCAL_PATH}/src/libraries/enet/*.cpp) \
   $(wildcard ${LOCAL_PATH}/src/libraries/enet/libenet/*.c) \
   $(wildcard ${LOCAL_PATH}/src/libraries/luasocket/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/luautf8/*.c) \
   $(wildcard ${LOCAL_PATH}/src/libraries/luasocket/libluasocket/*.c) \
   $(wildcard ${LOCAL_PATH}/src/libraries/noise1234/*.cpp) \
   $(wildcard ${LOCAL_PATH}/src/libraries/Wuff/*.c) \
diff --git a/jni/love/src/love.cpp b/jni/love/src/love.cpp
index 633fdc34..a7a204c7 100644
--- a/jni/love/src/love.cpp
+++ b/jni/love/src/love.cpp
@@ -18,8 +18,12 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#include "common/version.h"
 #include "modules/love/love.h"
+
+#ifndef LOVE_ANDROID
+#include "common/version.h"
+#endif
+
 #include <SDL.h>
 
 #ifdef LOVE_BUILD_EXE
@@ -195,12 +199,17 @@ int main(int argc, char **argv)
 	argv = hack_argv;
 #endif // LOVE_LEGENDARY_APP_ARGV_HACK
 
+#ifndef LOVE_ANDROID
+	// TODO: LOVE for Android creates a single library instead of executable
+	// and library. Therefore this check is not required, but causes a
+	// duplicate definition of the love::VERSION symbol.
 	if (strcmp(love::VERSION, love_version()) != 0)
 	{
 		printf("Version mismatch detected!\nLOVE binary is version %s\n"
 				"LOVE library is version %s\n", love::VERSION, love_version());
 		return 1;
 	}
+#endif
 
 	// Oh, you just want the version? Okay!
 	if (argc > 1 && strcmp(argv[1], "--version") == 0)