From 6548c979212671e79051c46c7c4e95880e4c41b8 Mon Sep 17 00:00:00 2001
From: "BADIM-PC\\Vadim" <grigoruk@gmail.com>
Date: Thu, 22 Feb 2018 19:43:13 +0300
Subject: [PATCH] Android works

---
 3rd-party                                 | 2 +-
 build/android/jni/sdlgpu/Android.mk       | 6 ++++++
 build/android/jni/src/Android.mk          | 3 ++-
 build/android/src/com/nesbox/tic/TIC.java | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 build/android/jni/sdlgpu/Android.mk

diff --git a/3rd-party b/3rd-party
index 709d58e..4c88c7e 160000
--- a/3rd-party
+++ b/3rd-party
@@ -1 +1 @@
-Subproject commit 709d58eef4f2e34b476d38759705d6420d06c548
+Subproject commit 4c88c7efa656ace687276be7e8507be6f06b83e8
diff --git a/build/android/jni/sdlgpu/Android.mk b/build/android/jni/sdlgpu/Android.mk
new file mode 100644
index 0000000..3dd9418
--- /dev/null
+++ b/build/android/jni/sdlgpu/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := sdlgpu
+LOCAL_SRC_FILES := ../../../../3rd-party/pre-built/android/sdlgpu/$(TARGET_ARCH_ABI)/libsdlgpu.so
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/build/android/jni/src/Android.mk b/build/android/jni/src/Android.mk
index 6dc6ca4..32c6c91 100644
--- a/build/android/jni/src/Android.mk
+++ b/build/android/jni/src/Android.mk
@@ -17,6 +17,7 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2_net-2.0.1 \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/moonscript \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/wren-0.1.0\src\include \
+	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/sdl-gpu/include \
 	$(LOCAL_PATH)/../../../../include
 
 # Add your application source files here...
@@ -55,7 +56,7 @@ LOCAL_SRC_FILES := \
 	$(SRC_PATH)/tic80.c \
 	$(SRC_PATH)/system.c
 
-LOCAL_SHARED_LIBRARIES := SDL2 lua z gif wren
+LOCAL_SHARED_LIBRARIES := SDL2 lua z gif wren sdlgpu
 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
 
diff --git a/build/android/src/com/nesbox/tic/TIC.java b/build/android/src/com/nesbox/tic/TIC.java
index 7320c68..c370359 100644
--- a/build/android/src/com/nesbox/tic/TIC.java
+++ b/build/android/src/com/nesbox/tic/TIC.java
@@ -12,6 +12,7 @@ public class TIC extends SDLActivity
 	protected String[] getLibraries() {
 		return new String[] {
 			"SDL2",
+			"sdlgpu",
 			"lua",
 			"wren",
 			"z",