From: Twinaphex Date: Tue, 6 Nov 2018 10:46:00 +0000 (+0100) Subject: Merge pull request #206 from Sakitoshi/master X-Git-Tag: r24l~761 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28ea3e2d87c4e239d8853b10c4496f82feb9d982;hp=de95fedd6981b4608cb78180e3bddde7e675223c;p=pcsx_rearmed.git Merge pull request #206 from Sakitoshi/master enabled scph-1110 analog joystick in the menu --- diff --git a/Makefile b/Makefile index 2a6be72b..89ab0aa1 100644 --- a/Makefile +++ b/Makefile @@ -263,11 +263,13 @@ frontend/revision.h: FORCE target_: $(TARGET) $(TARGET): $(OBJS) + @echo "** BUILDING $(TARGET) FOR PLATFORM $(PLATFORM) **" ifeq ($(STATIC_LINKING), 1) $(AR) rcs $@ $(OBJS) else $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) endif + @echo "** BUILD SUCCESSFUL! GG NO RE **" clean: $(PLAT_CLEAN) clean_plugins $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h diff --git a/Makefile.libretro b/Makefile.libretro index cb514b7b..11093b51 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -235,6 +235,41 @@ else ifeq ($(platform), rpi3) BUILTIN_GPU = neon USE_DYNAREC = 1 +# Classic Platforms #################### +# Platform affix = classic__<µARCH> +# Help at https://modmyclassic.com/comp + +# (armv7 a7, hard point, neon based) ### +# NESC, SNESC, C64 mini +else ifeq ($(platform), classic_armv7_a7) + TARGET := $(TARGET_NAME)_libretro.so + fpic := -fPIC + CFLAGS += -Ofast \ + -flto=4 -fwhole-program -fuse-linker-plugin \ + -fdata-sections -ffunction-sections -Wl,--gc-sections \ + -fno-stack-protector -fno-ident -fomit-frame-pointer \ + -falign-functions=1 -falign-jumps=1 -falign-loops=1 \ + -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \ + -fmerge-all-constants -fno-math-errno \ + -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard + CXXFLAGS += $(CFLAGS) + CPPFLAGS += $(CFLAGS) + ASFLAGS += $(CFLAGS) + HAVE_NEON = 1 + ARCH = arm + BUILTIN_GPU = neon + USE_DYNAREC = 1 + ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1) + CFLAGS += -march=armv7-a + else + CFLAGS += -march=armv7ve + # If gcc is 5.0 or later + ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1) + LDFLAGS += -static-libgcc -static-libstdc++ + endif + endif +####################################### + # ARM else ifneq (,$(findstring armv,$(platform))) TARGET := $(TARGET_NAME)_libretro.so