Filter out arm libs for Linux releases

This commit is contained in:
Sergey Stepanov 2020-07-02 16:31:25 +03:00
parent e7162d2085
commit 01d3bac538
No known key found for this signature in database
GPG key ID: A56B4929BAA8556B
2 changed files with 8 additions and 8 deletions

View file

@ -89,12 +89,12 @@ jobs:
mingw-w64-x86_64-opusfile
mingw-w64-x86_64-SDL2
msys2do make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/mingw.*dll CORE_EXT=dll
msys2do make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/mingw.*dll CORE_EXT=*.dll
- name: Build Linux app
if: matrix.os == 'ubuntu-latest'
run: |
make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/usr/lib.*\\\\s CORE_EXT=so
make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/usr/lib.*\\\\s CORE_EXT=*_libretro.so
- name: Build macOS app
if: matrix.os == 'macos-latest'
@ -103,7 +103,7 @@ jobs:
# should be recursive + paths rewritten to @executable_path
# lddx seems to be working ok
go get github.com/jtanx/lddx
make release RELEASE_DIR=${{ env.release-dir }} DLIB_ALTER=true DLIB_TOOL="lddx -r -c" CORE_EXT=dylib
make release RELEASE_DIR=${{ env.release-dir }} DLIB_ALTER=true DLIB_TOOL="lddx -r -c" CORE_EXT=*.dylib
- name: Save built app for upload
uses: actions/upload-artifact@v1

10
Makefile vendored
View file

@ -99,16 +99,16 @@ dev.run-docker:
# de. -> abc def ghj -> def
# Makefile special symbols should be escaped with \.
# - DLIB_ALTER: a special flag to use altered dynamic copy lib tool for macOS only.
# - CORE_EXT: a file extension of the cores to copy into the release.
# - CORE_EXT: a glob pattern to filter the cores that are copied into the release.
#
# Example:
# make release DLIB_TOOL="ldd -x" DLIB_SEARCH_PATTERN=/usr/lib.*\\\\s LIB_EXT=so
# make release DLIB_TOOL="ldd -x" DLIB_SEARCH_PATTERN=/usr/lib.*\\\\s CORE_EXT=*.so
#
RELEASE_DIR ?= release
DLIB_TOOL ?= ldd
DLIB_SEARCH_PATTERN ?= .*so
DLIB_ALTER ?= false
CORE_EXT ?= *
CORE_EXT ?= *_libretro.so
COORDINATOR_DIR = ./$(RELEASE_DIR)
WORKER_DIR = ./$(RELEASE_DIR)
CORES_DIR = assets/emulator/libretro/cores
@ -133,6 +133,6 @@ release: clean build
cp -R ./$(GAMES_DIR) $(WORKER_DIR)/assets
endif
mkdir -p $(WORKER_DIR)/$(CORES_DIR)
ifneq (,$(wildcard ./$(CORES_DIR)/*.$(CORE_EXT)))
cp -R ./$(CORES_DIR)/*.$(CORE_EXT) $(WORKER_DIR)/$(CORES_DIR)
ifneq (,$(wildcard ./$(CORES_DIR)/$(CORE_EXT)))
cp -R ./$(CORES_DIR)/$(CORE_EXT) $(WORKER_DIR)/$(CORES_DIR)
endif