From 036efa1efb22424849a33b5af924f5406dc5bd4a Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 31 Jan 2016 18:27:32 -0500 Subject: [PATCH 1/4] So much for apt-cyg. --- INSTALL.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index d47ca0dea..02f2ac872 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -50,15 +50,14 @@ 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` + 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`. In the **Cygwin terminal**: ```bash -install $(lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg) /bin -apt-cyg install make git python gcc-core libsasl2-3 ca-certificates - lynx -source bootstrap.pypa.io/get-pip.py | python pip install pypng From aa87b091635f14dc3bc6c499321ff6573da7af6d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 31 Jan 2016 18:30:58 -0500 Subject: [PATCH 2/4] Remove outdated Vagrant instructions. --- INSTALL.md | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 02f2ac872..02a2aed6b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -70,35 +70,3 @@ To build **pokecrystal.gbc**: ```bash make ``` - - -# Vagrant - -The simplest way to get pokecrystal to compile is to use Vagrant and -VirtualBox. Follow these steps: - -* [Download and install Vagrant](http://www.vagrantup.com/downloads.html) -* Follow the instructions to [download and install VirtualBox](http://docs-v1.vagrantup.com/v1/docs/getting-started/) -* Run these commands: - -```bash -vagrant box add pokecrystal http://diyhpl.us/~bryan/irc/pokecrystal/pokecrystal.box -mkdir vagrantbox -cd vagrantbox -vagrant init pokecrystal -vagrant up -vagrant ssh -c "cd /vagrant && git clone --recursive https://github.com/pret/pokecrystal" -vagrant ssh -``` - -Running "vagrant ssh" will give you a shell to type commands into for compiling -the source code. Then the "virtualbox" directory on the host appears as a shared -folder inside of the guest virtual machine at "/vagrant". - -To build the project, run these commands in the guest (that is, inside "vagrant -ssh"): - -```bash -cd /vagrant/pokecrystal -make -``` From 346114b040184258514b94460a6bb89717edd5a2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 31 Jan 2016 18:36:18 -0500 Subject: [PATCH 3/4] Explain why there is an INSTALL.md. --- INSTALL.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 02a2aed6b..e0a8cae35 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,10 @@ +The source files are assembled into a rom using [*rgbds*][https://github.com/bentley/rgbds]. +These instructions explain how to set up the tools required to build. + + # Linux -Note that this requires python2.7 for the moment. +Python 2.7 is required. ```bash sudo apt-get install make gcc bison git python python-pip From 3d2f30deb3e11a3fd405dad07baab19daa756ca0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 31 Jan 2016 18:42:32 -0500 Subject: [PATCH 4/4] Fix a typo. --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index e0a8cae35..befa3418a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -The source files are assembled into a rom using [*rgbds*][https://github.com/bentley/rgbds]. +The source files are assembled into a rom using [**rgbds**](https://github.com/bentley/rgbds). These instructions explain how to set up the tools required to build.