Bump extras; pypng is now part of extras.

This commit is contained in:
yenatch 2016-02-17 16:44:27 -05:00
parent 73a660bf2a
commit dd77706524
2 changed files with 7 additions and 7 deletions

View File

@ -7,8 +7,7 @@ These instructions explain how to set up the tools required to build.
Python 2.7 is required. Python 2.7 is required.
```bash ```bash
sudo apt-get install make gcc bison git python python-pip sudo apt-get install make gcc bison git python
pip install pypng
git clone https://github.com/bentley/rgbds git clone https://github.com/bentley/rgbds
cd rgbds cd rgbds
@ -32,7 +31,6 @@ In **Terminal**, run:
```bash ```bash
xcode-select --install xcode-select --install
sudo easy_install pypng
git clone https://github.com/bentley/rgbds git clone https://github.com/bentley/rgbds
cd rgbds cd rgbds
@ -54,7 +52,7 @@ make
To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings. 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/). 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`. 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**: In the **Cygwin terminal**:
```bash ```bash
lynx -source bootstrap.pypa.io/get-pip.py | python
pip install pypng
git clone --recursive https://github.com/pret/pokecrystal git clone --recursive https://github.com/pret/pokecrystal
cd pokecrystal cd pokecrystal
@ -74,3 +70,7 @@ To build **pokecrystal.gbc**:
```bash ```bash
make make
``` ```
## notes
- If `gettext` no longer exists, grab `libsasl2-3` `ca-certificates`.

2
extras

@ -1 +1 @@
Subproject commit 9644160b87e706f3a6ae20fe09e9c469f628c06d Subproject commit 68edf51f1070b056c281471242220f9c6142e1b6