mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-25 09:45:02 +00:00
Do not require colorama, do not use it (#1205)
This commit is contained in:
parent
4a6bfcdd21
commit
8ad90df27f
4 changed files with 8 additions and 24 deletions
|
@ -77,12 +77,6 @@ sudo apt-get update
|
|||
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:
|
||||
|
||||
* gcc-mips-linux-gnu
|
||||
|
|
|
@ -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
|
||||
- Run `source .bashrc` or close and reopen cygwin
|
||||
|
||||
## 3. Install required Python packages
|
||||
|
||||
To install the Python dependencies simply run in a terminal:
|
||||
|
||||
```bash
|
||||
python3 -m pip install colorama
|
||||
```
|
||||
|
||||
## 4. Continue with Linux instructions
|
||||
## 3. Continue with Linux instructions
|
||||
|
||||
You should be able to continue from step [step 2](../README.md#2-clone-the-repository) of the Linux instructions.
|
||||
|
||||
|
|
|
@ -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.)
|
||||
|
||||
To install the Python dependencies simply run in a terminal:
|
||||
|
||||
```bash
|
||||
python3 -m pip install colorama
|
||||
```
|
||||
|
||||
|
||||
## 2. Building mips-linux-binutils
|
||||
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
#!/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"
|
||||
|
||||
|
@ -72,7 +76,7 @@ def processZAPDArgs(argsZ):
|
|||
badZAPDArg = False
|
||||
for z in argsZ:
|
||||
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
|
||||
|
||||
if badZAPDArg:
|
||||
|
|
Loading…
Reference in a new issue