Skip to content

Commit ede82c1

Browse files
committed
Install makerom and remove dependencies
1 parent 28d6714 commit ede82c1

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

.github/workflows/pacman.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,12 @@ jobs:
1818
- uses: actions/checkout@v3
1919
with:
2020
submodules: recursive
21-
path: Thenaya
22-
23-
- uses: actions/checkout@v3
24-
with:
25-
repository: 3DSGuy/Project_CTR
26-
path: Project_CTR
27-
28-
- name: Compile makerom
29-
run: |
30-
cd Project_CTR
31-
make
32-
33-
- name: Install makerom
34-
run: |
35-
cp Project_CTR/makerom/bin/makerom Thenaya/makerom
36-
chmod a+x Thenaya/makerom
3721

3822
- name: Build Thenaya binaries
39-
run: |
40-
cd Thenaya
41-
make release
23+
run: make release
4224

4325
- name: Retrieve commit identification
4426
run: |
45-
cd Thenaya
4627
GIT_BRANCH=$(git name-rev --name-only HEAD)
4728
echo "GIT_BRANCH=${GIT_BRANCH}" >> $GITHUB_ENV
4829
GIT_HASH=$(git rev-parse --short HEAD)
@@ -52,8 +33,8 @@ jobs:
5233
with:
5334
name: Thenaya-${{ env.GIT_HASH }}
5435
path: |
55-
Thenaya/output/Thenaya_*.zip
56-
Thenaya/output/Thenaya.cia
36+
output/Thenaya_*.zip
37+
output/Thenaya.cia
5738
5839
- uses: 8bitDream/action-github-releases@v1.0.0
5940
if: github.event_name != 'pull_request'
@@ -63,8 +44,8 @@ jobs:
6344
prerelease: ${{ env.GIT_BRANCH != 'master' }}
6445
title: Thenaya-${{ env.GIT_HASH }}
6546
files: |
66-
Thenaya/output/Thenaya_*.zip
67-
Thenaya/output/Thenaya.cia
47+
output/Thenaya_*.zip
48+
output/Thenaya.cia
6849
6950
- name: Discord webhook notification
7051
uses: distributhor/workflow-webhook@v3.0.4

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ clean:
151151

152152
cia: $(BUILD)
153153
@echo making cia
154-
@./makerom -f cia -o Thenaya.cia -rsf cia.rsf -target t -exefslogo -elf Thenaya.elf -icon Thenaya.smdh -banner banner.bnr
154+
@makerom -f cia -o Thenaya.cia -rsf cia.rsf -target t -exefslogo -elf Thenaya.elf -icon Thenaya.smdh -banner banner.bnr
155155
@mkdir -p "$(OUTDIR)"
156156
@mv $(TARGET).3dsx $(TARGET).smdh $(TARGET).elf $(TARGET).cia $(OUTDIR)
157157

158158
release: $(BUILD)
159159
@echo making cia
160-
@./makerom -f cia -o Thenaya.cia -rsf cia.rsf -target t -exefslogo -elf Thenaya.elf -icon Thenaya.smdh -banner banner.bnr
160+
@makerom -f cia -o Thenaya.cia -rsf cia.rsf -target t -exefslogo -elf Thenaya.elf -icon Thenaya.smdh -banner banner.bnr
161161
@mkdir -p "$(OUTDIR)"
162162
@mkdir -p "3ds/Thenaya"
163163
@mv $(TARGET).3dsx $(TARGET).smdh "./3ds/Thenaya"

0 commit comments

Comments
 (0)