Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docker Support for OSX #91

Merged
merged 14 commits into from
Apr 25, 2020
Merged

Docker Support for OSX #91

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
469058e
Makefile machinery work
ethteck Apr 21, 2020
cc04501
Updating Jenkinsfile
ethteck Apr 21, 2020
3951872
Initial setup for OSX repo support
ethteck Apr 21, 2020
f54e3ab
Adding ido7 to repo
ethteck Apr 22, 2020
80f5b9b
Makefile reversion
ethteck Apr 22, 2020
48753ff
Merge branch 'ido7setup' into osx-support
ethteck Apr 22, 2020
60b02cc
Iniital Dockerfile
ethteck Apr 22, 2020
b6b50d6
Docker stuff
ethteck Apr 22, 2020
f605b3a
fixbaserom cleanup
ethteck Apr 23, 2020
c07bdf7
Merge branch 'master' into osx-support
ethteck Apr 23, 2020
53b27d9
Attempting to fix fixbaserom
ethteck Apr 23, 2020
d919946
baserom_original -> input
ethteck Apr 23, 2020
bada8c8
Revert "baserom_original -> input"
ethteck Apr 23, 2020
4bc9983
Spiffing up readme for OSX
ethteck Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "baserom_original -> input" 
This reverts commit d919946.
  • Loading branch information
@ethteck
ethteck committed Apr 23, 2020
commit bada8c893c592b228ae946c6b826247f44c0abf7
10 changes: 5 additions & 5 deletions fixbaserom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ def get_str_hash(byte_array):

# Determine if we have a ROM file
romFileName = ""
if path.exists("input.z64"):
romFileName = "input.z64"
elif path.exists("input.n64"):
romFileName = "input.n64"
if path.exists("baserom_original.z64"):
romFileName = "baserom_original.z64"
elif path.exists("baserom_original.n64"):
romFileName = "baserom_original.n64"

# Read in the original ROM
if romFileName != "":
Expand All @@ -47,7 +47,7 @@ def get_str_hash(byte_array):

print("Byte swapping done.")
else:
print("Error: Could not find input.z64/input.n64.")
print("Error: Could not find baserom_original.z64/baserom_original.n64.")
sys.exit(1)

# Strip the overdump
Expand Down