Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl

tools/configure.py

@@ -10,7 +10,7 @@ import ninja_syntax
 
 
 parser = argparse.ArgumentParser(description="Generates build.ninja")
-parser.add_argument('-w', type=str, default="wine", dest="wine", required=False, help="Path to Wine (linux only)")
+parser.add_argument('-w', type=str, default="./wibo", dest="wine", required=False, help="Path to Wine/Wibo (linux only)")
 parser.add_argument('version', help='Game version')
 args = parser.parse_args()
 

tools/setup.py

@@ -3,8 +3,10 @@ import zipfile
 import io
 from pathlib import Path
 import platform
+import stat
 
 DSD_VERSION = 'v0.4.0'
+WIBO_VERSION = '0.6.16'
 
 
 tools_path = Path(__file__).parent
@@ -30,8 +32,10 @@ match platform.machine().lower():
 
 print('\nInstalling dsd...')
 response = requests.get(f'https://github.com/AetiasHax/ds-decomp/releases/download/{DSD_VERSION}/dsd-{system}-{machine}{EXE}')
-with open(root_path / f'dsd{EXE}', 'wb') as f:
+dsd_path = root_path / f'dsd{EXE}'
+with open(dsd_path, 'wb') as f:
     f.write(response.content)
+dsd_path.chmod(dsd_path.stat().st_mode | stat.S_IEXEC)
 
 
 print('\nInstalling toolchain...')
@@ -39,3 +43,12 @@ response = requests.get('http://decomp.aetias.com/files/mwccarm.zip')
 zip_file = zipfile.ZipFile(io.BytesIO(response.content))
 zip_file.extractall(tools_path)
 
+
+if system == "linux":
+    print('\nInstalling wibo...')
+    response = requests.get(f'https://github.com/decompals/wibo/releases/download/{WIBO_VERSION}/wibo')
+    wibo_path = root_path / 'wibo'
+    with open(wibo_path, 'wb') as f:
+        f.write(response.content)
+    wibo_path.chmod(wibo_path.stat().st_mode | stat.S_IEXEC)
+