Replace wine with wibo

Dockerfile

@@ -22,15 +22,15 @@ RUN apt-get update \
         wget \
     && rm -rf /var/lib/apt/lists/* 
 
-# Install wine
-ARG WINE_BRANCH="stable"
-RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-    && echo "deb https://dl.winehq.org/wine-builds/debian/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
-    && dpkg --add-architecture i386 \
-    && apt-get update \
-    && apt-get install -y --install-recommends winehq-${WINE_BRANCH} \
-    && rm -rf /var/lib/apt/lists/* \
-    && wineboot --init
+# Install wine (not currently required - wibo is sufficient)
+# ARG WINE_BRANCH="stable"
+# RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+#     && echo "deb https://dl.winehq.org/wine-builds/debian/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
+#     && dpkg --add-architecture i386 \
+#     && apt-get update \
+#     && apt-get install -y --install-recommends winehq-${WINE_BRANCH} \
+#     && rm -rf /var/lib/apt/lists/* \
+#     && wineboot --init
 
 # Install build requirements
 # - musl is required by ps2toolchain

Makefile

@@ -24,8 +24,8 @@ EE       := $(PRODG)/ee/gcc/bin/ee-
 MW       := $(TOOLS_DIR)/compilers/mw/2.3.1.01/
 PS2DEV   := mips64r5900el-ps2-elf-
 CC_MW    := wibo $(MW)mwccmips.exe
-LD_MW    := wine $(MW)mwldmips.exe
-AS_PRODG := wine $(EE)as.exe
+LD_MW    := wibo $(MW)mwldmips.exe
+AS_PRODG := wibo $(EE)as.exe
 LD_GNU   := $(PS2DEV)ld
 OBJCOPY  := $(PS2DEV)objcopy
 PYTHON   := python

scripts/disassemble.py

@@ -115,7 +115,7 @@ def demangle_all(syms):
     # Split into lists of no more than 1024
     for i in range(0, len(syms), 1024):
         subset = syms[i:min(i+1024, len(syms))]
-        demangled = subprocess.check_output(['wine', f'{PRODG_PATH}/ee/gcc/bin/ee-c__filt.exe', *subset]).decode().strip().splitlines()
+        demangled = subprocess.check_output(['wibo', f'{PRODG_PATH}/ee/gcc/bin/ee-c__filt.exe', *subset]).decode().strip().splitlines()
         out.update(dict([(subset[i], s) for i, s in enumerate(demangled)]))
     return out
 

scripts/section_stripper.py

@@ -5,7 +5,7 @@
 PRODG_PATH = os.environ['PRODG']
 
 def read_empty_sections(obj):
-    output = subprocess.check_output(['wine', f'{PRODG_PATH}/ee/gcc/bin/ee-readelf.exe', '-S', obj]).decode()
+    output = subprocess.check_output(['wibo', f'{PRODG_PATH}/ee/gcc/bin/ee-readelf.exe', '-S', obj]).decode()
     empty_sections = []
 
     for line in output.splitlines():