Improve makefiles

This commit is contained in:
Francisco Javier Trujillo Mata 2022-11-08 21:30:47 +01:00
parent 4d92fc5f76
commit 7a8617bad5
3 changed files with 20 additions and 17 deletions

View File

@ -25,7 +25,7 @@ jobs:
- name: Compile RA - name: Compile RA
run: | run: |
export PATH=~/cli:$PATH # .net cli export PATH=~/cli:$PATH # .net cli
make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 && make -f Makefile.orbis oelf eboot make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
- name: Get short SHA - name: Get short SHA
id: slug id: slug
@ -36,9 +36,8 @@ jobs:
name: bin-${{ steps.slug.outputs.sha8 }} name: bin-${{ steps.slug.outputs.sha8 }}
path: | path: |
retroarch_orbis.elf retroarch_orbis.elf
homebrew.oelf retroarch_orbis.oelf
homebrew.self retroarch_orbis.self
- name: Version of binaries - name: Version of binaries
run: | run: |

View File

@ -176,7 +176,7 @@ else
CXXFLAGS += -O3 CXXFLAGS += -O3
endif endif
TARGETS := $(TARGET).elf TARGETS := $(TARGET).self
all: $(TARGETS) all: $(TARGETS)
@ -197,15 +197,17 @@ OBJOUT = -o
$(TARGET).elf: $(OBJ) $(TARGET).elf: $(OBJ)
$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf $(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
$(TARGET).oelf: $(TARGET).elf
@orbis-elf-create $(TARGET).elf $(TARGET).oelf
$(TARGET).self: $(TARGET).oelf
python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
install: install:
@cp homebrew.self $(SELF_PATH_INSTALL) @cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
@echo "Installed!" @echo "Installed!"
oelf:
@orbis-elf-create $(TARGET).elf homebrew.oelf
eboot:
python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) homebrew.oelf homebrew.self
clean: clean:
rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
.PHONY: clean all .PHONY: clean all

View File

@ -115,15 +115,17 @@ OBJOUT = -o
$(TARGET).elf: $(OBJ) $(TARGET).elf: $(OBJ)
$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf $(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
$(TARGET).oelf: $(TARGET).elf
@orbis-elf-create $(TARGET).elf $(TARGET).oelf
$(TARGET).self: $(TARGET).oelf
python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
install: install:
@cp homebrew.self $(SELF_PATH_INSTALL) @cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
@echo "Installed!" @echo "Installed!"
oelf:
@orbis-elf-create $(TARGET).elf homebrew.oelf
eboot:
python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) homebrew.oelf homebrew.self
clean: clean:
rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
.PHONY: clean all .PHONY: clean all