experimental port to Mac OSX

Currently it can open cre-based docs and Djvu docs
It still has some problems with PDF docs and the touch input.
pull/1963/head
chrox 8 years ago
parent 3a94ea4809
commit df65d2972a

@ -18,6 +18,10 @@ trim_trailing_whitespace = false
indent_style = tab indent_style = tab
indent_size = 8 indent_size = 8
[Makefile.def]
indent_style = tab
indent_size = 4
[*.{js,css,scss,sass,html,handlebars,tpl}] [*.{js,css,scss,sass,html,handlebars,tpl}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2

1
.gitignore vendored

@ -37,5 +37,6 @@ koreader-kobo-arm-linux-gnueabihf*
koreader-emulator-i686-w64-mingw32 koreader-emulator-i686-w64-mingw32
koreader-emulator-x86_64-linux-gnu koreader-emulator-x86_64-linux-gnu
koreader-emulator-x86_64-pc-linux-gnu koreader-emulator-x86_64-pc-linux-gnu
koreader-emulator-x86_64-apple-darwin*
koreader-pocketbook-arm-obreey-linux-gnueabi koreader-pocketbook-arm-obreey-linux-gnueabi
koreader-ubuntu-touch-arm-linux-gnueabihf koreader-ubuntu-touch-arm-linux-gnueabihf

@ -63,7 +63,7 @@ ifneq ($(or $(EMULATE_READER),$(WIN32)),)
cd $(INSTALL_DIR)/koreader/spec/front/unit && test -e data || \ cd $(INSTALL_DIR)/koreader/spec/front/unit && test -e data || \
ln -sf ../../test ./data ln -sf ../../test ./data
else else
cp -rfL $(KOR_BASE)/$(OUTPUT_DIR)/* $(INSTALL_DIR)/koreader/ $(RCP) -fL $(KOR_BASE)/$(OUTPUT_DIR)/* $(INSTALL_DIR)/koreader/
endif endif
for f in $(INSTALL_FILES); do \ for f in $(INSTALL_FILES); do \
ln -sf ../../$$f $(INSTALL_DIR)/koreader/; \ ln -sf ../../$$f $(INSTALL_DIR)/koreader/; \
@ -77,9 +77,9 @@ ifdef WIN32
cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll . cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll .
endif endif
@echo "[*] Install plugins" @echo "[*] Install plugins"
cp -r plugins/* $(INSTALL_DIR)/koreader/plugins/ $(RCP) plugins/* $(INSTALL_DIR)/koreader/plugins/
@echo "[*] Installresources" @echo "[*] Installresources"
cp -rpL resources/fonts/* $(INSTALL_DIR)/koreader/fonts/ $(RCP) -pL resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
install -d $(INSTALL_DIR)/koreader/{screenshots,data/{dict,tessdata},fonts/host,ota} install -d $(INSTALL_DIR)/koreader/{screenshots,data/{dict,tessdata},fonts/host,ota}
ifeq ($(or $(EMULATE_READER),$(WIN32)),) ifeq ($(or $(EMULATE_READER),$(WIN32)),)
@echo "[*] Clean up, remove unused files for releases" @echo "[*] Clean up, remove unused files for releases"

@ -8,8 +8,9 @@ KOReader
KOReader is a document viewer application, originally created for Kindle KOReader is a document viewer application, originally created for Kindle
e-ink readers. It currently runs on Kindle, Kobo, PocketBook, Ubuntu Touch e-ink readers. It currently runs on Kindle, Kobo, PocketBook, Ubuntu Touch
and Android (2.3+) devices. Developers can also run Koreader emulator and Android (2.3+) devices. Developers can also run KOReader emulator
for development purpose on desktop PC with Linux and Windows operating system. for development purpose on desktop PC with Linux and Windows and
Mac OSX (experimental for now).
Main features for users Main features for users
----------------------- -----------------------
@ -91,6 +92,11 @@ sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686 sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686
``` ```
Mac OSX users may need to install these tools:
```
brew install gcc48 nasm binutils libtool autoconf automake sdl2
```
A recent version of Android SDK/NDK and `ant` are needed in order to build A recent version of Android SDK/NDK and `ant` are needed in order to build
Koreader for Android devices. Koreader for Android devices.
``` ```
@ -155,10 +161,10 @@ Then, run this command to build installable package for Android:
./kodev release android ./kodev release android
``` ```
For emulating KOReader on Linux and Windows For emulating KOReader on Linux, Windows and Mac OSX
------------- -------------
To build an emulator on current Linux machine just run: To build an emulator on current Linux or OSX machine:
``` ```
./kodev build ./kodev build
``` ```

@ -1 +1 @@
Subproject commit 02c4e24e732f4d7009b71c763dbaa503c40365a1 Subproject commit afaf36bc7aba673a6c4ec8159f79ed8f5d9996ec
Loading…
Cancel
Save