summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Romeo <vittorio.romeo@outlook.com>2020-06-16 13:50:01 +0100
committerVittorio Romeo <vittorio.romeo@outlook.com>2020-06-16 13:50:01 +0100
commitd18a98f5f0ace3b0ef0c6259bbf6bae7e1461c84 (patch)
treefaa1c372bf632c7f823c666635f987c6b60e016b
parent6d41ee0ba4f0dd5f76410e440668d3dda222eee8 (diff)
-rw-r--r--README.md20
-rw-r--r--README_OLD.md118
-rw-r--r--todo.txt1
-rwxr-xr-xwget-assets.sh2
4 files changed, 12 insertions, 129 deletions
diff --git a/README.md b/README.md
index 1bcd065f..26b2f65d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,4 @@
-## [Open Hexagon 2.0](http://www.facebook.com/OpenHexagon) - [by Vittorio Romeo](http://vittorioromeo.info)
-
----
-
-### [Official README](http://vittorioromeo.info/Downloads/OpenHexagon/README.html)
-
----
+# [Open Hexagon 2.0](http://www.facebook.com/OpenHexagon) - [by Vittorio Romeo](http://vittorioromeo.info)
## How to build on Windows
@@ -14,7 +8,7 @@
3. Run `open_distro_window.bat` from your MinGW installation to open a shell.
-4. Clone this repository and initialize it.
+4. Clone this repository and initialize it:
```bash
git clone git://github.com/SuperV1234/SSVOpenHexagon.git
@@ -49,9 +43,17 @@
cp ./SSVOpenHexagon.exe ../_RELEASE
```
-8. Download assets
+8. Run the game:
+
+ ```bash
+ cd ../_RELEASE
+ ./SSVOpenHexagon.exe
+ ```
+
+9. (Optional) Download assets:
```bash
+ # (from repository root)
./wget-assets.sh ./_RELEASE/
```
diff --git a/README_OLD.md b/README_OLD.md
deleted file mode 100644
index a0e77123..00000000
--- a/README_OLD.md
+++ /dev/null
@@ -1,118 +0,0 @@
-## [Open Hexagon 2.0](http://www.facebook.com/OpenHexagon) - [by Vittorio Romeo](http://vittorioromeo.info)
-
----
-
-### [Official README](http://vittorioromeo.info/Downloads/OpenHexagon/README.html)
-
----
-
-## A C++14 compiler is required!
-
-* `g++ 5.1` and `clang++ 3.4` should work properly.
-
----
-
-## How to build on Linux (debian derivatives)
-
-Tested on `Linux Mint 15 x64` and `Linux Mint 15 x86`.
-
-1. Clone this repository and initialize it
-```bash
-git clone git://github.com/SuperV1234/SSVOpenHexagon.git
-cd SSVOpenHexagon
-./init-repository.sh
-```
-
-2. If your distribution packages SFML 2 you can install it through your package manager otherwise build and install it [manually](https://www.sfml-dev.org/tutorials/2.4/compile-with-cmake.php) - you can also try the [Ubuntu PPA](https://github.com/SFML/ubuntu-sfml/wiki) or the [official binaries](http://sfml-dev.org/download/sfml/2.0/)
-
-3. Install dependencies
-```bash
-sudo apt-get install liblua5.2-dev zlib1g-dev
-```
-
-4. Build dependencies and Open Hexagon
-```bash
-./build-repository-oh.sh
-```
-
-5. Download assets
-```bash
-./wget-assets.sh ./_RELEASE/
-```
-
-*(or clone [SSVOpenHexagonAssets](https://github.com/SuperV1234/SSVOpenHexagonAssets))*
-
----
-
-## How to build on Arch Linux
-
-Tested on `Arch Linux x64` and `ArchBang x86`.
-
-1. Clone this repository and initialize it
-```bash
-git clone git://github.com/SuperV1234/SSVOpenHexagon.git
-cd SSVOpenHexagon
-./init-repository.sh
-```
-
-2. Install dependencies
-```bash
-sudo pacman -S sfml lua51 zlib
-```
-
-3. Build dependencies and Open Hexagon
-```bash
-cd SSVOpenHexagon
-./build-repository-oh.sh
-```
-
-4. You may have to append `/usr/local/lib` to the `$PATH` or `$LD_LIBRARY_PATH` environment variables to allow Open Hexagon to find the required libraries - if that doesn't work, try:
-```bash
-sudo ldconfig /usr/local/lib
-```
-
-5. Download assets
-```bash
-./wget-assets.sh ./_RELEASE/
-```
-
-*(or clone [SSVOpenHexagonAssets](https://github.com/SuperV1234/SSVOpenHexagonAssets))*
-
----
-
-## How to build on Windows
-
-Tested on `Windows 8 x86`
-
-1. Get [7-Zip](http://downloads.sourceforge.net/sevenzip/7z920.exe), [MinGW](http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.1/32-bit/threads-posix/dwarf/x32-4.8.1-release-posix-dwarf-rev2.7z/download) and add it to your `$PATH`, [CMake](http://www.cmake.org/files/v2.8/cmake-2.8.11.2-win32-x86.exe), [Git](http://git-scm.com/download/win), [UPX](http://upx.sourceforge.net/)
-
-2. Clone this repository and open bash
-```posh
-git clone git://github.com/SuperV1234/SSVOpenHexagon.git
-cd SSVOpenHexagon
-```
-3. Pull everything recursively using `git bash`
-```bash
-./init-repository.sh`
-```
-
-4. Get [SFML2.1](http://sfml-dev.org/), [Lua5.2 binaries](http://sourceforge.net/projects/luabinaries/files/), [Lua5.2 includes](http://sourceforge.net/projects/luabinaries/files/), [Zlib](http://www.zlib.net/) and extract in `SSVOpenHexagon/extlibs/`, manually adjusting paths to have the result shown below
-```
-extlibs/SSV*/
- ...
-extlibs/SFML/
-extlibs/SFML/bin/
-extlibs/SFML/lib/
-extlibs/SFML/include/
- ...
-extlibs/lua/
-extlibs/lua/include/
-extlibs/lua/lib/
- ...
-extlibs/zlib/
-extlibs/zlib/bin/
-extlibs/zlib/include/
-extlibs/zlib/lib/
-```
-
-5. Build with `./build-win.bat` and download assets manually from `http://vittorioromeo.info/Misc/Linked/OHResources/`
diff --git a/todo.txt b/todo.txt
deleted file mode 100644
index ae885240..00000000
--- a/todo.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/xiaobin83/lua
diff --git a/wget-assets.sh b/wget-assets.sh
index 392889a6..44a800df 100755
--- a/wget-assets.sh
+++ b/wget-assets.sh
@@ -16,4 +16,4 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then
fi
cd "$1"
-wget -r -nH --cut-dirs=4 --no-parent -e robots=off --reject="*index.html*" "http://vittorioromeo.info/Misc/Linked/OHResources/$FOLDERNAME/" \ No newline at end of file
+wget -r -nH --cut-dirs=4 --no-parent -e robots=off --reject="*index.html*" "http://vittorioromeo.info/Misc/Linked/OHResources/$FOLDERNAME/"