notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git subrepo clone https://github.com/libretro/libretro-common.git deps/libretro-common
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
7dded84
..
3546180
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-49,10
+49,13
@@
EXTRA_LDFLAGS =
# select some defaults
ifneq (,$(findstring $(ARCH_DETECTED),arm aarch64))
DYNAREC = ari64
# select some defaults
ifneq (,$(findstring $(ARCH_DETECTED),arm aarch64))
DYNAREC = ari64
-ifneq (
$(findstring __thumb__,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),
)
+ifneq (
,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'define __thumb__')
)
# must disable thumb as ari64 can't handle it
CFLAGS += -marm
endif
# must disable thumb as ari64 can't handle it
CFLAGS += -marm
endif
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'HAVE_NEON32'))
+ BUILTIN_GPU = neon
+endif
endif
ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))
BUILTIN_GPU = neon
endif
ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))
BUILTIN_GPU = neon
@@
-502,7
+505,10
@@
else ifeq ($(platform), emscripten)
else
TARGET := $(TARGET_NAME)_libretro.dll
PLATFORM = libretro
else
TARGET := $(TARGET_NAME)_libretro.dll
PLATFORM = libretro
- MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
+ MAIN_LDFLAGS += -static-libgcc -static-libstdc++
+ifneq ($(DEBUG),1)
+ MAIN_LDFLAGS += -s
+endif
CFLAGS += -D__WIN32__ -DNO_DYLIB
MMAP_WIN32=1
MAIN_LDLIBS += -lws2_32
CFLAGS += -D__WIN32__ -DNO_DYLIB
MMAP_WIN32=1
MAIN_LDLIBS += -lws2_32
@@
-525,8
+531,9
@@
endif
ifndef ARCH
ARCH = $(ARCH_DETECTED)
endif
ifndef ARCH
ARCH = $(ARCH_DETECTED)
endif
-ifndef HAVE_NEON
-HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+ifndef HAVE_NEON_ASM
+# asm for 32bit only
+HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep -q HAVE_NEON32 && echo 1 || echo 0)
endif
ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
MAIN_LDFLAGS += -Wl,--no-undefined
endif
ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
MAIN_LDFLAGS += -Wl,--no-undefined
@@
-535,10
+542,10
@@
ifdef ALLOW_LIGHTREC_ON_ARM
CFLAGS += -DALLOW_LIGHTREC_ON_ARM
endif
ifeq ($(BUILTIN_GPU),neon)
CFLAGS += -DALLOW_LIGHTREC_ON_ARM
endif
ifeq ($(BUILTIN_GPU),neon)
-if
eq ($(ARCH_DETECTED),i686
)
+if
neq (,$(findstring $(ARCH),x86 i686)
)
CFLAGS_GPU_NEON ?= -msse2 # required
endif
CFLAGS_GPU_NEON ?= -msse2 # required
endif
-ifeq ($(ARCH
_DETECTED
),x86_64)
+ifeq ($(ARCH),x86_64)
CFLAGS_GPU_NEON ?= -mssse3 # optional, for more perf
endif
CFLAGS += $(CFLAGS_GPU_NEON)
CFLAGS_GPU_NEON ?= -mssse3 # optional, for more perf
endif
CFLAGS += $(CFLAGS_GPU_NEON)
@@
-560,6
+567,16
@@
NO_CONFIG_MAK = yes
#endif
#endif
#endif
#endif
+$(info TARGET: $(TARGET))
+$(info platform: $(platform))
+$(info ARCH: $(ARCH))
+$(info DYNAREC: $(DYNAREC))
+$(info BUILTIN_GPU: $(BUILTIN_GPU))
+$(info CC: $(CC))
+$(info CFLAGS: $(CFLAGS))
+$(info MAIN_LDLIBS: $(MAIN_LDLIBS))
+$(info )
+
include Makefile
# no special AS needed for gpu_neon
include Makefile
# no special AS needed for gpu_neon