summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2016-05-26 02:19:40 +0200
committerTwinaphex2016-05-26 02:19:40 +0200
commitc11bdbce9928c98e9bbe3e9466024ee203072d25 (patch)
treeba532463f687f681f8f7eedfef840a943390d200
parent7a5380ca8448ed840a3932fb1f4d65e43782c9a7 (diff)
parent9dbea7573e6e78ffb880f907a0c86aa1bafc856f (diff)
downloadpicogpsp-c11bdbce9928c98e9bbe3e9466024ee203072d25.tar.gz
picogpsp-c11bdbce9928c98e9bbe3e9466024ee203072d25.tar.bz2
picogpsp-c11bdbce9928c98e9bbe3e9466024ee203072d25.zip
Merge pull request #24 from vanfanel/master
Removed redundant CFLAG and added Rpi3 platform
-rw-r--r--Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 42ec880..bfd43fc 100644
--- a/Makefile
+++ b/Makefile
@@ -215,13 +215,26 @@ else ifeq ($(platform), ctr)
HAVE_DYNAREC = 1
STATIC_LINKING = 1
+# Raspberry Pi 3
+else ifeq ($(platform), rpi3)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+ CFLAGS += -DARM -DARM_ARCH
+ CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ CFLAGS += -fomit-frame-pointer -ffast-math
+ CFLAGS += -DARM_MEMORY_DYNAREC
+ CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+ CPU_ARCH := arm
+ HAVE_DYNAREC = 1
+
# Raspberry Pi 2
else ifeq ($(platform), rpi2)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
CFLAGS += -DARM -DARM_ARCH
- CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations
+ CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
CFLAGS += -fomit-frame-pointer -ffast-math
CFLAGS += -DARM_MEMORY_DYNAREC
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@@ -234,7 +247,7 @@ else ifeq ($(platform), rpi1)
fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
CFLAGS += -DARM11 -DARM_ARCH
- CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j -funsafe-math-optimizations
+ CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j
CFLAGS += -fomit-frame-pointer -ffast-math
CFLAGS += -DARM_MEMORY_DYNAREC
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11