Merge pull request #1909 from vpeter4/libretro-desmume

libretro-desmume: remove unneeded patch
This commit is contained in:
MilhouseVH 2017-08-21 18:06:00 +01:00 committed by GitHub
commit 6be1abff3e
2 changed files with 5 additions and 17 deletions

View File

@ -39,19 +39,19 @@ PKG_LIBVAR="DESMUME_LIB"
make_target() {
case $PROJECT in
RPi)
make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s
make -f Makefile.libretro CC=$CC platform=armv6-hardfloat-arm1176jzf-s
;;
RPi2)
make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7
make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a7
;;
imx6)
make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9
make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a9
;;
WeTek_Play|WeTek_Core)
make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9
make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a9
;;
Generic)
make -f Makefile.libretro
make -f Makefile.libretro CC=$CC
;;
esac
}

View File

@ -1,12 +0,0 @@
diff -Naur a/Makefile.libretro b/Makefile.libretro
--- a/Makefile.libretro 2016-01-07 21:04:18.000000000 +0100
+++ b/Makefile.libretro 2016-01-07 21:46:25.556864218 +0100
@@ -96,7 +96,7 @@
TARGET := $(TARGET_NAME)_libretro.so
SHARED := -shared -Wl,--version-script=libretro/link.T
fpic := -fPIC
- CC = gcc
+ CC ?= gcc
DESMUME_JIT_ARM = 1
ifneq (,$(findstring cortexa8,$(platform)))
CPPFLAGS += -marm -mcpu=cortex-a8