Skip to content

Commit

Permalink
build: remove arm flags for emulator
Browse files Browse the repository at this point in the history
  • Loading branch information
houqp committed Oct 26, 2014
1 parent bfe8dfa commit cbb5859
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
9 changes: 5 additions & 4 deletions Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ else
endif

# set CC CXX AR LD RANLIB
ifeq ($(TARGET), kindle)
ifneq (,$(filter $(TARGET), kindle, arm-generic))
CHOST?=arm-linux-gnueabi
else ifeq ($(TARGET), kindle5)
CHOST?=arm-kindle5-linux-gnueabi
Expand Down Expand Up @@ -151,12 +151,13 @@ else ifeq ($(TARGET), kindle-legacy)
else ifeq ($(TARGET), android)
ARM_ARCH:=$(ANDROID_ARCH)
ARM_ARCH+=-mfloat-abi=softfp
else ifeq ($(TARGET), win32)
ARM_ARCH:=
else
else ifeq ($(TARGET), arm-generic)
# Defaults to generic crap
ARM_ARCH:=$(ARMV6_GENERIC_ARCH)
ARM_ARCH+=-mfloat-abi=softfp
else
# else, we are compiling emulator on x86
ARM_ARCH:=
endif

# Clang 3.4 on Travis however doesn't define macro '__extern_always_inline'
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,20 @@ Follow these steps:
* make sure you have patch, wget, unzip, git and svn installed
* run `make fetchthirdparty`.

* run `make TARGET=kindle` for Kindle devices.
* run `make TARGET=kindle` for touch based Kindle devices.

* or run `make TARGET=kobo` for Kobo devices.
* run `make TARGET=kindle-legacy` for Kindle DXG/2/3/4 devices.

* or run `make TARGET=android` for Android devices.
* or run `make TARGET=kobo` for Kobo devices.

* or run `make TARGET=android` for Android devices.

* or run `make TARGET=win32` for Windows.

* or run `make TARGET=generic-arm` for generic ARM devices.

* or run `make` for emulator on Linux.

## Use ccache

Ccache can speed up recompilation by caching previous compilations and detecting
Expand Down

0 comments on commit cbb5859

Please sign in to comment.