Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #567 from theGoodwins/no-wine-no-fix

Browse source 
Make fix be auto.
This commit is contained in:
lambertjamesd 2023-12-19 22:23:43 -07:00 committed by GitHub
parent bc30375226 d9bcadb551
commit fbfa70638b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -13,7 +13,11 @@ VTF2PNG:=vtf2png
SFZ2N64:=sfz2n64
$(SKELATOOL64):
chmod +x skelatool64/setup_dependencies.sh
skelatool64/setup_dependencies.sh
@$(MAKE) -C skelatool64
OPTIMIZER := -Os
@ -555,6 +559,8 @@ $(BASE_TARGET_NAME).z64: $(CODESEGMENT)_no_debug.o $(OBJECTS) $(DATA_OBJECTS) $(
$(LD) -L. -T $(CP_LD_SCRIPT)_no_debug.ld -Map $(BASE_TARGET_NAME)_no_debug.map -o $(BASE_TARGET_NAME).elf
$(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME).elf $(BASE_TARGET_NAME).z64 -O binary
makemask $(BASE_TARGET_NAME).z64
chmod +x tools/romfix64.sh
sh tools/romfix64.sh $(BASE_TARGET_NAME).z64
# with debugger
CODEOBJECTS_DEBUG = $(CODEOBJECTS)
@ -573,6 +579,8 @@ $(BASE_TARGET_NAME)_debug.z64: $(CODESEGMENT)_debug.o $(OBJECTS) $(DATA_OBJECTS)
$(LD) -L. -T $(CP_LD_SCRIPT)_debug.ld -Map $(BASE_TARGET_NAME)_debug.map -o $(BASE_TARGET_NAME)_debug.elf
$(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME)_debug.elf $(BASE_TARGET_NAME)_debug.z64 -O binary
makemask $(BASE_TARGET_NAME)_debug.z64
chmod +x tools/romfix64.sh
sh tools/romfix64.sh $(BASE_TARGET_NAME).z64
clean:
rm -rf build
@ -600,11 +608,4 @@ clean-assets:
rm -f $(BASE_TARGET_NAME).z64
rm -f $(BASE_TARGET_NAME)_debug.z64
fix:
wine tools/romfix64.exe $(BASE_TARGET_NAME).z64
fix-nowine:
chmod +x tools/romfix64.sh
sh tools/romfix64.sh $(BASE_TARGET_NAME).z64
.SECONDARY:

14
README.md
View file

@ -157,20 +157,8 @@ make clean
# Build (default build with english audio)
make
```
In case you have any trouble with the ROM running on hardware try padding the ROM.
```
make fix-nowine
```
You can also try the old way of paddinng the ROM, but you don't need both.
This method requires you to install wine to run properly. [WINE](https://wiki.winehq.org/Ubuntu)
```
make fix
```
Alternatively, you can also prepare to build with additional audio languages, like this (multiple commands per build possible):
You can also prepare to build the ROM with additional audio languages, like this (multiple commands per build possible):
```
make french_audio

BIN
tools/romfix64.exe
View file

Binary file not shown.