Browse Source

move platform dependent files into 'platform' directory

pull/944/head
chrox 7 years ago
parent
commit
2d3c502948
21 changed files with 19 additions and 14 deletions
  1. +2
    -2
      .gitmodules
  2. +17
    -12
      Makefile
  3. +0
    -0
      platform/android/llapp_main.lua
  4. +0
    -0
      platform/android/luajit-launcher
  5. +0
    -0
      platform/kindle/extensions/koreader/README.txt
  6. +0
    -0
      platform/kindle/extensions/koreader/bin/koreader-ext.sh
  7. +0
    -0
      platform/kindle/extensions/koreader/config.xml
  8. +0
    -0
      platform/kindle/extensions/koreader/menu.json
  9. +0
    -0
      platform/kindle/koreader.sh
  10. +0
    -0
      platform/kindle/kotar_cpoint
  11. +0
    -0
      platform/kindle/launchpad/koreader.ini
  12. +0
    -0
      platform/kindle/libkohelper.sh
  13. +0
    -0
      platform/kobo/fmon/README.txt
  14. +0
    -0
      platform/kobo/fmon/koreader.sh
  15. +0
    -0
      platform/kobo/koreader.sh
  16. +0
    -0
      platform/kobo/nickel.sh
  17. +0
    -0
      platform/kobo/suspend.sh
  18. +0
    -0
      platform/win32/SDL2.dll
  19. +0
    -0
      platform/win32/libgcc_s_sjlj-1.dll
  20. +0
    -0
      platform/win32/libstdc++-6.dll
  21. +0
    -0
      platform/win32/libwinpthread-1.dll

+ 2
- 2
.gitmodules View File

@ -1,6 +1,6 @@
[submodule "koreader-base"]
path = koreader-base
url = git://github.com/koreader/koreader-base.git
[submodule "android/luajit-launcher"]
path = android/luajit-launcher
[submodule "platform/android/luajit-launcher"]
path = platform/android/luajit-launcher
url = https://github.com/koreader/android-luajit-launcher.git

+ 17
- 12
Makefile View File

@ -14,8 +14,13 @@ export PATH:=$(CURDIR)/$(KOR_BASE)/toolchain/android-toolchain/bin:$(PATH)
MACHINE?=$(shell PATH=$(PATH) $(CC) -dumpmachine 2>/dev/null)
INSTALL_DIR=koreader-$(MACHINE)
ANDROID_DIR=android
# platform directories
PLATFORM_DIR=platform
KINDLE_DIR=$(PLATFORM_DIR)/kindle
KOBO_DIR=$(PLATFORM_DIR)/kobo
ANDROID_DIR=$(PLATFORM_DIR)/android
ANDROID_LAUNCHER_DIR:=$(ANDROID_DIR)/luajit-launcher
WIN32_DIR=$(PLATFORM_DIR)/win32
# files to link from main directory
INSTALL_FILES=reader.lua frontend resources defaults.lua l10n \
@ -54,7 +59,7 @@ ifdef ANDROID
endif
ifdef WIN32
# install runtime libraries for win32
cd $(INSTALL_DIR)/koreader && cp ../../windows/*.dll .
cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll .
endif
# install plugins
cp -r plugins/* $(INSTALL_DIR)/koreader/plugins/
@ -102,11 +107,11 @@ kindleupdate: all
# remove old package if any
rm -f koreader-kindle-$(MACHINE)-$(VERSION).zip
# Kindle launching scripts
ln -sf ../kindle/extensions $(INSTALL_DIR)/
ln -sf ../kindle/launchpad $(INSTALL_DIR)/
ln -sf ../../kindle/koreader.sh $(INSTALL_DIR)/koreader
ln -sf ../../kindle/libkohelper.sh $(INSTALL_DIR)/koreader
ln -sf ../../kindle/kotar_cpoint $(INSTALL_DIR)/koreader
ln -sf ../$(KINDLE_DIR)/extensions $(INSTALL_DIR)/
ln -sf ../$(KINDLE_DIR)/launchpad $(INSTALL_DIR)/
ln -sf ../../$(KINDLE_DIR)/koreader.sh $(INSTALL_DIR)/koreader
ln -sf ../../$(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/koreader
ln -sf ../../$(KINDLE_DIR)/kotar_cpoint $(INSTALL_DIR)/koreader
# create new package
# Don't bundle launchpad on touch devices..
ifeq ($(TARGET), kindle-legacy)
@ -137,13 +142,13 @@ koboupdate: all
rm -f koreader-kobo-$(MACHINE)-$(VERSION).zip
# Kobo launching scripts
mkdir -p $(INSTALL_DIR)/kobo/mnt/onboard/.kobo
ln -sf ../../../../../kobo/fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/
ln -sf ../../../../../$(KOBO_DIR)/fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/
cd $(INSTALL_DIR)/kobo && tar -czhf ../KoboRoot.tgz mnt
cp resources/koreader.png $(INSTALL_DIR)/koreader.png
cp kobo/fmon/README.txt $(INSTALL_DIR)/README_kobo.txt
cp kobo/koreader.sh $(INSTALL_DIR)/koreader
cp kobo/suspend.sh $(INSTALL_DIR)/koreader
cp kobo/nickel.sh $(INSTALL_DIR)/koreader
cp $(KOBO_DIR)/fmon/README.txt $(INSTALL_DIR)/README_kobo.txt
cp $(KOBO_DIR)/koreader.sh $(INSTALL_DIR)/koreader
cp $(KOBO_DIR)/suspend.sh $(INSTALL_DIR)/koreader
cp $(KOBO_DIR)/nickel.sh $(INSTALL_DIR)/koreader
# create new package
cd $(INSTALL_DIR) && \
zip -9 -r \

android/llapp_main.lua → platform/android/llapp_main.lua View File


android/luajit-launcher → platform/android/luajit-launcher View File


kindle/extensions/koreader/README.txt → platform/kindle/extensions/koreader/README.txt View File


kindle/extensions/koreader/bin/koreader-ext.sh → platform/kindle/extensions/koreader/bin/koreader-ext.sh View File


kindle/extensions/koreader/config.xml → platform/kindle/extensions/koreader/config.xml View File


kindle/extensions/koreader/menu.json → platform/kindle/extensions/koreader/menu.json View File


kindle/koreader.sh → platform/kindle/koreader.sh View File


kindle/kotar_cpoint → platform/kindle/kotar_cpoint View File


kindle/launchpad/koreader.ini → platform/kindle/launchpad/koreader.ini View File


kindle/libkohelper.sh → platform/kindle/libkohelper.sh View File


kobo/fmon/README.txt → platform/kobo/fmon/README.txt View File


kobo/fmon/koreader.sh → platform/kobo/fmon/koreader.sh View File


kobo/koreader.sh → platform/kobo/koreader.sh View File


kobo/nickel.sh → platform/kobo/nickel.sh View File


kobo/suspend.sh → platform/kobo/suspend.sh View File


windows/SDL2.dll → platform/win32/SDL2.dll View File


windows/libgcc_s_sjlj-1.dll → platform/win32/libgcc_s_sjlj-1.dll View File


windows/libstdc++-6.dll → platform/win32/libstdc++-6.dll View File


windows/libwinpthread-1.dll → platform/win32/libwinpthread-1.dll View File


Loading…
Cancel
Save