Merge branch 'ido7setup' into osx-support

.gitignore

@@ -24,7 +24,6 @@ baserom/
 out.txt
 
 # Tool artifacts
-tools/ido7.1_compiler/*
 tools/mipspro7.2_compiler/
 tools/overlayhelpers/batchdisasm/output/*
 tools/overlayhelpers/batchdisasm/output2/*
@@ -44,4 +43,4 @@ tools/asmsplitter/c/*
 *.ci8.png
 
 #Per-user configuration
-.python-version
+.python-version

Jenkinsfile

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

Makefile

@@ -22,7 +22,6 @@ LD         := $(MIPS_BINUTILS_PREFIX)ld
 OBJCOPY    := $(MIPS_BINUTILS_PREFIX)objcopy
 OBJDUMP    := $(MIPS_BINUTILS_PREFIX)objdump
 
-# Be sure to grab ido7.1_compiler and put it in tools/ first.
 CC         := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
 CC_OLD     := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
 

fixbaserom.py

@@ -7,6 +7,8 @@ import hashlib
 
 # Determine if we have a ROM file
 romFileName = ""
+if (path.exists("baserom.z64")):
+    romFileName = "baserom.z64"
 if (path.exists("baserom_original.z64")):
     romFileName = "baserom_original.z64"
 elif (path.exists("baserom_original.n64")):