summaryrefslogtreecommitdiff
path: root/INSTALL.md
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /INSTALL.md
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'INSTALL.md')
-rw-r--r--INSTALL.md29
1 files changed, 16 insertions, 13 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 11450d93..c9696f72 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,14 +1,14 @@
# Linux
- sudo apt-get install make gcc bison git python python-setuptools
- sudo easy_install pypng
+ sudo apt-get install make gcc bison git python python-pip
+ sudo pip install pypng
- git clone git://github.com/bentley/rgbds.git
+ git clone https://github.com/bentley/rgbds
cd rgbds
sudo make install
cd ..
- git clone --recursive git://github.com/iimarckus/pokered.git
+ git clone --recursive https://github.com/pret/pokered
cd pokered
To build **pokered.gbc** and **pokeblue.gbc**:
@@ -23,17 +23,17 @@ To build them individually:
# Mac
-In the shell, run:
+In **Terminal**, run:
xcode-select --install
sudo easy_install pypng
- git clone git://github.com/bentley/rgbds.git
+ git clone https://github.com/bentley/rgbds
cd rgbds
sudo make install
cd ..
- git clone --recursive git://github.com/iimarckus/pokered.git
+ git clone --recursive https://github.com/pret/pokered
cd pokered
make
@@ -41,17 +41,20 @@ In the shell, run:
# Windows
-To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (32-bit).
-
-In the installer, select the following packages: `make` `git` `gettext` `python` `python-setuptools`
+To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings.
Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/).
-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`.
In the **Cygwin terminal**:
- easy_install pypng
- git clone --recursive git://github.com/iimarckus/pokered.git
+ install $(lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg) /bin
+ apt-cyg install make git python gettext
+
+ lynx -source bootstrap.pypa.io/get-pip.py | python
+ pip install pypng
+
+ git clone --recursive https://github.com/pret/pokered
cd pokered
make