DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-06 08:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak makerom build script

Browse Source
This commit is contained in:
jakcron
2022-04-13 14:51:25 +08:00
parent 83e69641ab
commit 0d1175e349
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/Build_MakeROM.yml
+14 -7
View File
@@ -15,28 +15,35 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
dist: [ubuntu_x86_64, macos_x86_64, win_x86_64] dist: [ubuntu_x86_64, macos_x86_64, macos_arm64, win_x86_64]
prog: [makerom] prog: [makerom]
include: include:
- dist: win_x86_64
os: windows-latest
makeArgs: -j $env:NUMBER_OF_PROCESSORS
binExt: .exe
- dist: ubuntu_x86_64 - dist: ubuntu_x86_64
os: ubuntu-latest os: ubuntu-latest
arch: x86_64
makeArgs: -j$(nproc) makeArgs: -j$(nproc)
- dist: macos_x86_64 - dist: macos_x86_64
os: macos-latest os: macos-latest
arch: x86_64
makeArgs: -j$(sysctl -n hw.activecpu) makeArgs: -j$(sysctl -n hw.activecpu)
- dist: macos_x86_64
os: macos-latest
arch: arm64
makeArgs: -j$(sysctl -n hw.activecpu)
- dist: win_x86_64
os: windows-latest
arch: x86_64
makeArgs: -j $env:NUMBER_OF_PROCESSORS
binExt: .exe
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Compile ${{ matrix.prog }} - name: Compile ${{ matrix.prog }}
working-directory: ${{ matrix.prog }} working-directory: ${{ matrix.prog }}
run: make PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all run: make ${{ matrix.makeArgs }} PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.prog }}-${{ matrix.dist }} name: ${{ matrix.prog }}-${{ matrix.dist }}
path: ./${{ matrix.prog }}/bin/${{ matrix.prog }} path: ./${{ matrix.prog }}/bin/${{ matrix.prog }}${{ matrix.binExt }}
if-no-files-found: error if-no-files-found: error
makerom/makefile
+11 -9
View File
@@ -74,6 +74,8 @@ ifeq ($(PROJECT_PLATFORM_ARCH),)
export PROJECT_PLATFORM_ARCH = $(shell uname -m) export PROJECT_PLATFORM_ARCH = $(shell uname -m)
else ifeq ($(PROJECT_PLATFORM), MACOS) else ifeq ($(PROJECT_PLATFORM), MACOS)
export PROJECT_PLATFORM_ARCH = $(shell uname -m) export PROJECT_PLATFORM_ARCH = $(shell uname -m)
else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
export PROJECT_PLATFORM_ARCH = $(shell uname -m)
else else
export PROJECT_PLATFORM_ARCH = x86_64 export PROJECT_PLATFORM_ARCH = x86_64
endif endif
@@ -89,15 +91,6 @@ ifeq ($(PROJECT_PLATFORM), WIN32)
INC += INC +=
LIB += -static LIB += -static
ARFLAGS = cr -o ARFLAGS = cr -o
else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
# CygWin Flags/Libs
#CC =
#CXX =
WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
ARCHFLAGS =
INC +=
LIB += -liconv
ARFLAGS = cr -o
else ifeq ($(PROJECT_PLATFORM), GNU) else ifeq ($(PROJECT_PLATFORM), GNU)
# GNU/Linux Flags/Libs # GNU/Linux Flags/Libs
#CC = #CC =
@@ -116,6 +109,15 @@ else ifeq ($(PROJECT_PLATFORM), MACOS)
INC += INC +=
LIB += -liconv LIB += -liconv
ARFLAGS = rc ARFLAGS = rc
else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
# CygWin Flags/Libs
#CC =
#CXX =
WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
ARCHFLAGS =
INC +=
LIB += -liconv
ARFLAGS = cr -o
endif endif
# Compiler Flags # Compiler Flags