From f6a9c694dcdd8cf89b2f7a28df2cf240e67ace39 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 1 Jun 2014 11:53:09 -0400
Subject: [PATCH] refactor: update reader to use new launcher

---
 Makefile                | 7 ++++++-
 android/llapp_main.lua  | 4 ++++
 android/luajit-launcher | 2 +-
 koreader-base           | 2 +-
 reader.lua              | 7 +++++++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 android/llapp_main.lua

diff --git a/Makefile b/Makefile
index dd71a9e49..3b1670bc8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@ export PATH:=$(CURDIR)/$(KOR_BASE)/toolchain/android-toolchain/bin:$(PATH)
 MACHINE?=$(shell PATH=$(PATH) $(CC) -dumpmachine 2>/dev/null)
 INSTALL_DIR=koreader-$(MACHINE)
 
-ANDROID_LAUNCHER_DIR:=android/luajit-launcher
+ANDROID_DIR=android
+ANDROID_LAUNCHER_DIR:=$(ANDROID_DIR)/luajit-launcher
 
 # files to link from main directory
 INSTALL_FILES=reader.lua frontend resources defaults.lua l10n \
@@ -47,6 +48,10 @@ endif
 	for f in $(INSTALL_FILES); do \
 		ln -sf ../../$$f $(INSTALL_DIR)/koreader/; \
 	done
+ifdef ANDROID
+	cd $(INSTALL_DIR)/koreader && \
+		ln -sf ../../$(ANDROID_DIR)/*.lua .
+endif
 	# install plugins
 	cp -r plugins/* $(INSTALL_DIR)/koreader/plugins/
 	cp -rpL resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
diff --git a/android/llapp_main.lua b/android/llapp_main.lua
new file mode 100644
index 000000000..c8f5c30d6
--- /dev/null
+++ b/android/llapp_main.lua
@@ -0,0 +1,4 @@
+local A = require("android")
+
+ARGV = {"-d", "/sdcard"}
+dofile(A.dir.."/reader.lua")
diff --git a/android/luajit-launcher b/android/luajit-launcher
index b7b14ec4d..3cee0cff6 160000
--- a/android/luajit-launcher
+++ b/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit b7b14ec4d09f0a6330ce6b05ce9d4c8e6a6eb572
+Subproject commit 3cee0cff606e0fba035c651ed5306fc27f0402bc
diff --git a/koreader-base b/koreader-base
index 1b94479ca..271d3dced 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 1b94479ca1878e78542e9d30e9e7b0d7f2521ae2
+Subproject commit 271d3dcede9f9bcc7f5613c7f81f28f17271a0d5
diff --git a/reader.lua b/reader.lua
index 319f6d3b8..01f6d203e 100755
--- a/reader.lua
+++ b/reader.lua
@@ -1,5 +1,12 @@
 #!./koreader-base
 
+require "libs/libkoreader-lfs"
+einkfb = require("ffi/framebuffer")
+input = require("ffi/input")
+freetype = require("ffi/freetype")
+Image = require("ffi/mupdfimg")
+util = require("ffi/util")
+
 require "defaults"
 package.path = "?.lua;common/?.lua;frontend/?.lua"
 package.cpath = "?.so;common/?.so;/usr/lib/lua/?.so"