diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-05-30 11:09:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 11:09:59 -0400 |
| commit | 515ebdce9daf801705fa9d4f03f01b3c26269488 (patch) | |
| tree | 032f17e7745beddf88d81e6888705a3f8d7d2889 /Dockerfile | |
| parent | 676ecf06c505fcea34048a059a79d1afaa7368a4 (diff) | |
ZAPD update: libpng, zroom improvements and others (#811)
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "769f5702a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "769f5702a"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Add `libpng` to readme
* Remove `-ifp` since it doesn't exists anymore in ZAPD
* Remove extra print I added
* Add UNK_09 macro and other minor fixes
* Simplify PNG rules
* simplify gitignore
* Update README.md
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update dockerfile
* basic instructions for cygwin and mac
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "86160be69"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "86160be69"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change nanoseconds to seconds in extract_assets.py
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile index 8d979fc8f..47ebeca8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,10 @@ RUN apt-get update && \ unzip \ clang-tidy \ clang-format \ + clang-format-11 \ nano \ - vbindiff - -RUN wget \ - https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \ - -O qemu.deb && \ - echo 8170f37cf03a08cc2d7c1c58f10d650ea0d158f711f6916da9364f6d8c85f741 qemu.deb | sha256sum --check && \ - dpkg -i qemu.deb && \ - rm qemu.deb + vbindiff \ + libpng-dev RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein RUN python3 -m pip install --upgrade attrs pycparser |