Merge pull request #162 from Yanis002/decomp_merge

Merge `zeldaret/oot` changes

Dockerfile

@@ -1,5 +1,7 @@
-FROM ubuntu:22.04 as build
+FROM ubuntu:24.04 AS build
+
 ENV TZ=UTC
+ENV LANG=C.UTF-8
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get update && \
@@ -19,15 +21,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein "mapfile-parser>=1.2.1,<2.0.0" "rabbitizer>=1.0.0,<2.0.0"
-RUN python3 -m pip install --upgrade attrs pycparser
-
-ENV LANG C.UTF-8
 
-RUN mkdir /oot
 WORKDIR /oot
-
 RUN git config --global --add safe.directory /oot
 
-CMD ["/bin/sh", "-c", \
-    "echo 'usage:\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc) setup\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc)'"]
+CMD make -j $(nproc) setup && make -j $(nproc) && tail -f /dev/null

INSTALLATION.md

@@ -32,18 +32,21 @@ The build process has the following package requirements:
 * git
 * build-essential
 * binutils-mips-linux-gnu
+* curl
 * python3
 * python3-pip
 * python3-venv
 * libpng-dev
-* gcc-mips-linux-gnu
 * libxml2-dev
+* gcc-mips-linux-gnu
+
+Note: you can use another GCC as long as it target MIPS.
 
 Under Debian / Ubuntu (which we recommend using), you can install them with the following commands:
 
 ```bash
 sudo apt-get update
-sudo apt-get install git build-essential binutils-mips-linux-gnu python3 python3-pip python3-venv libpng-dev gcc-mips-linux-gnu libxml2-dev
+sudo apt-get install git build-essential binutils-mips-linux-gnu curl python3 python3-pip python3-venv libpng-dev libxml2-dev gcc-mips-linux-gnu
 ```
 
 #### 2. Clone the repository