summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-02-17 16:44:27 -0500
committeryenatch <yenatch@gmail.com>2016-02-17 16:44:27 -0500
commitdd777065247b3926a63aef4410cc22993455410c (patch)
tree027f33bc09bc83b105e1a5e50197759291c427ef
parent73a660bf2a4f4d91ee846f403ce128fc30958b85 (diff)
Bump extras; pypng is now part of extras.
-rw-r--r--INSTALL.md12
m---------extras0
2 files changed, 6 insertions, 6 deletions
diff --git a/INSTALL.md b/INSTALL.md
index befa3418a..f595ca176 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,8 +7,7 @@ These instructions explain how to set up the tools required to build.
Python 2.7 is required.
```bash
-sudo apt-get install make gcc bison git python python-pip
-pip install pypng
+sudo apt-get install make gcc bison git python
git clone https://github.com/bentley/rgbds
cd rgbds
@@ -32,7 +31,6 @@ In **Terminal**, run:
```bash
xcode-select --install
-sudo easy_install pypng
git clone https://github.com/bentley/rgbds
cd rgbds
@@ -54,7 +52,7 @@ make
To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings.
-In the installer, select the following packages: `make` `git` `python` `python-setuptools` `gcc-core` `libsasl2-3` `ca-certificates`
+In the installer, select the following packages: `make` `git` `python` `gettext`
Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/).
Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`.
@@ -62,8 +60,6 @@ Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\
In the **Cygwin terminal**:
```bash
-lynx -source bootstrap.pypa.io/get-pip.py | python
-pip install pypng
git clone --recursive https://github.com/pret/pokecrystal
cd pokecrystal
@@ -74,3 +70,7 @@ To build **pokecrystal.gbc**:
```bash
make
```
+
+## notes
+
+- If `gettext` no longer exists, grab `libsasl2-3` `ca-certificates`.
diff --git a/extras b/extras
-Subproject 9644160b87e706f3a6ae20fe09e9c469f628c06
+Subproject 68edf51f1070b056c281471242220f9c6142e1b