mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Do not require colorama, do not use it (#1205)

Browse source
This commit is contained in:
Dragorn421 2022-04-29 21:15:00 +02:00 committed by GitHub
parent 4a6bfcdd21
commit 8ad90df27f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -77,12 +77,6 @@ sudo apt-get update
sudo apt-get install git build-essential binutils-mips-linux-gnu python3 libpng-dev sudo apt-get install git build-essential binutils-mips-linux-gnu python3 libpng-dev
``` ```
To install the Python dependencies simply run in a terminal:
```bash
python3 -m pip install colorama
```
If you are using GCC as the compiler for Ocarina of Time, you will also need: If you are using GCC as the compiler for Ocarina of Time, you will also need:
* gcc-mips-linux-gnu * gcc-mips-linux-gnu

10
docs/BUILDING_CYGWIN.md
View file

@ -67,15 +67,7 @@ Add the new binutils binaries to your system PATH:
- Scroll to the bottom and add `PATH=$PATH:/opt/cross/bin` to a new line and save the file - Scroll to the bottom and add `PATH=$PATH:/opt/cross/bin` to a new line and save the file
- Run `source .bashrc` or close and reopen cygwin - Run `source .bashrc` or close and reopen cygwin
## 3. Install required Python packages ## 3. Continue with Linux instructions
To install the Python dependencies simply run in a terminal:
```bash
python3 -m pip install colorama
```
## 4. Continue with Linux instructions
You should be able to continue from step [step 2](../README.md#2-clone-the-repository) of the Linux instructions. You should be able to continue from step [step 2](../README.md#2-clone-the-repository) of the Linux instructions.

6
docs/BUILDING_MACOS.md
View file

@ -23,12 +23,6 @@ brew install coreutils make python3 libpng bash clang-format
(The repository expects Homebrew-installed programs to be either linked correctly in `$PATH` etc. or in their default locations.) (The repository expects Homebrew-installed programs to be either linked correctly in `$PATH` etc. or in their default locations.)
To install the Python dependencies simply run in a terminal:
```bash
python3 -m pip install colorama
```
## 2. Building mips-linux-binutils ## 2. Building mips-linux-binutils

10
extract_assets.py
View file

@ -1,8 +1,12 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse, json, os, signal, time, colorama, multiprocessing import argparse
import json
import os
import signal
import time
import multiprocessing
colorama.init()
EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json" EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json"
@ -72,7 +76,7 @@ def processZAPDArgs(argsZ):
badZAPDArg = False badZAPDArg = False
for z in argsZ: for z in argsZ:
if z[0] == '-': if z[0] == '-':
print(f"{colorama.Fore.LIGHTRED_EX}error{colorama.Fore.RESET}: argument \"{z}\" starts with \"-\", which is not supported.", file=os.sys.stderr) print(f'error: argument "{z}" starts with "-", which is not supported.', file=os.sys.stderr)
badZAPDArg = True badZAPDArg = True
if badZAPDArg: if badZAPDArg: