Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Set up to compile with arm-kindle-linux-x-tools-glibc2.5-gcc4.2.4.tar.gz toolchain."

Browse Source 
This reverts commit 2650faa000
as described in #229
This commit is contained in:
Dobrica Pavlinusic 2012-08-27 20:53:14 +02:00
parent 5c9a8fbec6
commit 5a897fba77
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -16,7 +16,7 @@ TTF_FONTS_DIR=$(MUPDFDIR)/fonts
# set this to your ARM cross compiler:
HOST:=arm-kindle-linux-gnueabi
HOST:=arm-none-linux-gnueabi
CC:=$(HOST)-gcc
CXX:=$(HOST)-g++
STRIP:=$(HOST)-strip
@ -27,16 +27,14 @@ endif
HOSTCC:=gcc
HOSTCXX:=g++
SYSROOT=/usr/local/arm/$(HOST)/$(HOST)/sysroot/
CFLAGS:=-O3 --sysroot=$(SYSROOT)
CXXFLAGS:=-O3 --sysroot=$(SYSROOT)
LDFLAGS:= --sysroot=$(SYSROOT)
CFLAGS:=-O3 $(SYSROOT)
CXXFLAGS:=-O3 $(SYSROOT)
LDFLAGS:= $(SYSROOT)
ARM_CFLAGS:=-march=armv6
# use this for debugging:
#CFLAGS:=-O0 -g
DYNAMICLIBSTDCPP:=-lstdc++
STATICLIBSTDCPP=$(SYSROOT)lib/libstdc++.a
ifdef STATICLIBSTDCPP
DYNAMICLIBSTDCPP:=
endif
@ -126,7 +124,7 @@ djvu.o: %.o: %.c
$(CC) -c $(KPDFREADER_CFLAGS) -I$(DJVUDIR)/ $< -o $@
cre.o: %.o: %.cpp
$(CC) -c -I$(CRENGINEDIR)/crengine/include/ -I$(LUADIR)/src $< -o $@
$(CC) -c -I$(CRENGINEDIR)/crengine/include/ -I$(LUADIR)/src $< -o $@ -lstdc++
lfs.o: $(LFSDIR)/src/lfs.c
$(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(LFSDIR)/src $(LFSDIR)/src/lfs.c -o $@
@ -202,7 +200,7 @@ $(LUALIB):
ifdef EMULATE_READER
make -C $(LUADIR)
else
make -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="--sysroot=$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
make -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
endif
thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS)