mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55 from fig02/master

Browse source 
Fix make setup
This commit is contained in:
fig02 2020-04-10 15:13:31 -04:00 committed by GitHub
commit 0f17ed8961
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Jenkinsfile vendored
View file

@ -6,7 +6,6 @@ pipeline {
steps { steps {
echo 'Setting up...' echo 'Setting up...'
sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64'
sh 'git submodule update --init --recursive'
sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler' sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler'
sh 'chmod +x -R tools/ido*' sh 'chmod +x -R tools/ido*'
sh 'make -j`nproc` setup' sh 'make -j`nproc` setup'

4
fixbaserom.py
View file

@ -48,10 +48,10 @@ print("Patching header...")
strippedContent[0x3E] = 0x50 strippedContent[0x3E] = 0x50
# Check to see if the ROM is a "vanilla" Debug ROM # Check to see if the ROM is a "vanilla" Debug ROM
md5Hash = hashlib.md5(bytearray(strippedContent)).hexdigest() md5Hash = hashlib.md5(bytes(strippedContent)).hexdigest()
if (str(md5Hash) != "f0b7f35375f9cc8ca1b2d59d78e35405"): if (str(md5Hash) != "f0b7f35375f9cc8ca1b2d59d78e35405"):
print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom is probably not \"vanilla\"") print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom has probably been tampered, find a new one")
sys.exit(1) sys.exit(1)
# Write out our new ROM # Write out our new ROM

1
makefile
View file

@ -130,6 +130,7 @@ clean:
$(RM) $(ROM) $(ELF) -r build $(RM) $(ROM) $(ELF) -r build
setup: setup:
git submodule update --init --recursive
make -C tools make -C tools
python3 fixbaserom.py python3 fixbaserom.py
python3 extract_baserom.py python3 extract_baserom.py