aboutsummaryrefslogtreecommitdiff
path: root/Makefile.libretro
diff options
context:
space:
mode:
authornotaz2016-09-21 02:24:37 +0300
committernotaz2016-09-21 02:24:37 +0300
commit9766e77ddec3157cbf8b7da407b99f47467a8f72 (patch)
tree4684ad5828896ca870ffa6fe8fe53af943141cc2 /Makefile.libretro
parent38b1da12aade33bf94bdbe71a3988db6f57fb012 (diff)
parent1e212a25c55c298490867c2ded029c82db1d2b9d (diff)
downloadpcsx_rearmed-9766e77ddec3157cbf8b7da407b99f47467a8f72.tar.gz
pcsx_rearmed-9766e77ddec3157cbf8b7da407b99f47467a8f72.tar.bz2
pcsx_rearmed-9766e77ddec3157cbf8b7da407b99f47467a8f72.zip
Merge branch 'mainline' into libretro
Diffstat (limited to 'Makefile.libretro')
-rw-r--r--Makefile.libretro13
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.libretro b/Makefile.libretro
index 01c1fcf..0f6608d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -185,7 +185,7 @@ else ifeq ($(platform), qnx)
DRC_CACHE_BASE = 0
BUILTIN_GPU = neon
ARCH = arm
- CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+ CFLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
ASFLAGS += -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
MAIN_LDLIBS += -lsocket
LIBPTHREAD :=
@@ -268,6 +268,17 @@ ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
MAIN_LDFLAGS += -Wl,--no-undefined
endif
+# try to autodetect stuff for the lazy
+ifndef ARCH
+ARCH = $(shell $(CC) -dumpmachine | awk -F- '{print $$1}')
+endif
+ifndef HAVE_NEON
+HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+endif
+ifeq ($(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
+MAIN_LDFLAGS += -Wl,--no-undefined
+endif
+
TARGET ?= libretro.so
PLATFORM = libretro
BUILTIN_GPU ?= peops