Merge pull request #5148 from CvH/10.0/drop-mame

cleanup: drop mame
This commit is contained in:
Matthias Reichl 2021-02-17 17:05:37 +01:00 committed by GitHub
commit e190e36914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 148 deletions

View File

@ -1,42 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libretro-mame"
PKG_VERSION="f0f4ea6c5bdac62fe74491dcd205c1cd77016ae0"
PKG_SHA256="acdee7eeac28de1ab257cd2593c3d3266863875139d9a201f572d8044e3eb96e"
PKG_ARCH="x86_64 arm"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mame"
PKG_URL="https://github.com/libretro/mame/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform"
PKG_LONGDESC="game.libretro.mame: MAME for Kodi"
PKG_BUILD_FLAGS="-gold -lto"
PKG_TOOLCHAIN="make"
PKG_LIBNAME="mame_libretro.so"
PKG_LIBPATH="${PKG_LIBNAME}"
PKG_LIBVAR="MAME_LIB"
pre_make_target() {
PKG_MAKE_OPTS_TARGET=" \
REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python3 CONFIG=libretro \
LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="${ARCH}" DISTRO="debian-stable" \
CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \
TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro""
if [ "${ARCH}" = "arm" ]; then
PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE="""
elif [ "${ARCH}" = "x86_64" ]; then
PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1""
fi
}
post_make_target() {
mv ${PKG_BUILD}/mamearcade_libretro.so ${PKG_BUILD}/mame_libretro.so
}
makeinstall_target() {
mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
}

View File

@ -1,42 +0,0 @@
diff --git a/3rdparty/genie/src/actions/make/make_cpp.lua b/3rdparty/genie/src/actions/make/make_cpp.lua
index 880d9d35bf..69fe6f06bf 100644
--- a/3rdparty/genie/src/actions/make/make_cpp.lua
+++ b/3rdparty/genie/src/actions/make/make_cpp.lua
@@ -632,7 +632,7 @@
_p('')
elseif (path.getextension(file) == ".rc") then
- _p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
+ _p('$(OBJDIR)/%s.res: %s | $(OBJDIR)', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
if prj.msgresource then
_p('\t@echo ' .. prj.msgresource)
else
diff --git a/makefile b/makefile
index 49a30ef20b..c31ee8e318 100644
--- a/makefile
+++ b/makefile
@@ -1710,12 +1710,11 @@ genie: $(GENIE)
generate: \
genie \
- $(GEN_FOLDERS) \
$(GENDIR)/version.cpp \
$(patsubst %.po,%.mo,$(call rwildcard, language/, *.po)) \
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
$(GENDIR)/mame/machine/mulcd.hxx \
- $(GENDIR)/includes/SDL2
+ $(GENDIR)/includes/SDL2 | $(GEN_FOLDERS)
$(GENDIR)/includes/SDL2:
-$(call MKDIR,$@)
@@ -1751,7 +1750,7 @@ $(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/complay.py | $(GEN_FOLDERS)
@echo Compressing $<...
$(SILENT)$(PYTHON) scripts/build/complay.py $< $@ layout_$(basename $(notdir $<))
-$(GENDIR)/mame/machine/mulcd.hxx: $(SRC)/mame/machine/mulcd.ppm scripts/build/file2str.py
+$(GENDIR)/mame/machine/mulcd.hxx: $(SRC)/mame/machine/mulcd.ppm scripts/build/file2str.py | $(GEN_FOLDERS)
@echo Converting $<...
$(SILENT)$(PYTHON) scripts/build/file2str.py $< $@ mulcd_bkg uint8_t
--

View File

@ -1,21 +0,0 @@
diff --git a/3rdparty/genie/build/gmake.linux/genie.make b/3rdparty/genie/build/gmake.linux/genie.make
index fbb6530885..d9da6513ae 100644
--- a/3rdparty/genie/build/gmake.linux/genie.make
+++ b/3rdparty/genie/build/gmake.linux/genie.make
@@ -28,8 +28,12 @@ else
RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
endif
-CC = gcc
-CXX = g++
+CC = $(HOST_CC)
+CXX = $(HOST_CXX)
+CPPFLAGS = $(HOST_CPPFLAGS)
+CFLAGS = $(HOST_CFLAGS)
+CXXFLAGS = $(HOST_CXXFLAGS)
+LDFLAGS = $(HOST_LDFLAGS)
AR = ar
ifndef RESCOMP
--

View File

@ -1,26 +0,0 @@
diff --git a/makefile b/makefile
index c31ee8e318..55f2a96ae4 100644
--- a/makefile
+++ b/makefile
@@ -1372,16 +1372,19 @@ $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile: makefile $(SCRIPTS) $(GENIE)
.PHONY: linux_x64
linux_x64: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)64 precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)64 dasm
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)64
.PHONY: linux_x86
linux_x86: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32 precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32 dasm
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32
.PHONY: linux
linux: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) dasm
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
#-------------------------------------------------
--

View File

@ -1,17 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame"
PKG_VERSION="0.224.0.6-Leia"
PKG_SHA256="e516b446c0d790d5dc12aa8ae12c050ab1fcc48dddcfb59f0440711d5798fc77"
PKG_REV="1"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/kodi-game/game.libretro.mame"
PKG_URL="https://github.com/kodi-game/game.libretro.mame/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame"
PKG_SECTION=""
PKG_LONGDESC="game.libretro.mame: MAME emulator for Kodi"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="kodi.gameclient"