summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2015-03-14 05:16:15 +0100
committerTwinaphex2015-03-14 05:16:15 +0100
commit3309d13f80b94d380cca6b386a6c0dcaeefa5ac7 (patch)
treed7f200549ee6d9196d343219d2ec693a7d41828b
parentd57f89f3f1cb7730fdaabda0237833ef3235c22c (diff)
parentcc31802c5907a9ca0b0d57148c273ef0207f6ab0 (diff)
downloadpicogpsp-3309d13f80b94d380cca6b386a6c0dcaeefa5ac7.tar.gz
picogpsp-3309d13f80b94d380cca6b386a6c0dcaeefa5ac7.tar.bz2
picogpsp-3309d13f80b94d380cca6b386a6c0dcaeefa5ac7.zip
Merge pull request #13 from sergiobenrocha2/master
[ARM] Enable dynarec, works at least in rpi.
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e3c1979..fbce907 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,8 @@ ifeq ($(platform), unix)
ifeq ($(HAVE_DYNAREC),1)
HAVE_MMAP = 1
endif
+
+# Linux portable
else ifeq ($(platform), linux-portable)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC -nostdlib
@@ -240,10 +242,12 @@ else ifneq (,$(findstring armv,$(platform)))
CFLAGS += -mfloat-abi=hard
ASFLAGS += -mfloat-abi=hard
endif
- # Disable dynarec for now, issue 11
- #HAVE_DYNAREC := 1
- #CFLAGS += -DARM -DARM_ARCH -DARM_MEMORY_DYNAREC
CFLAGS += -DARM -DARM_ARCH
+ # Dynarec works at least in rpi, take a look at issue #11
+ ifeq (,$(findstring no-dynarec,$(platform)))
+ HAVE_DYNAREC := 1
+ CFLAGS += -DARM_MEMORY_DYNAREC
+ endif
LDFLAGS := -Wl,--no-undefined
# emscripten