From 05577684c4bfdcc99bbae1b188c50eb95ad2c653 Mon Sep 17 00:00:00 2001 From: mewmew Date: Fri, 8 Jun 2018 19:59:40 +0200 Subject: [PATCH 1/2] Add extended installation instructions for Linux and Windows --- INSTALL_linux.md | 29 +++++++++++++++++++++++++++++ INSTALL_windows.md | 27 +++++++++++++++++++++++++++ README.md | 5 +++++ 3 files changed, 61 insertions(+) create mode 100644 INSTALL_linux.md create mode 100644 INSTALL_windows.md diff --git a/INSTALL_linux.md b/INSTALL_linux.md new file mode 100644 index 0000000..5bb83ff --- /dev/null +++ b/INSTALL_linux.md @@ -0,0 +1,29 @@ +# Installation + +## Dependencies + +```bash +pacman -Sy mingw-w64-gcc mingw-w64-binutils +``` + +## Building + +```bash +git clone https://github.com/galaxyhaxz/devilution +cd devilution +cp /path/to/diablo_game_dir/diabloui.dll . +cp /path/to/diablo_game_dir/storm.dll . +make +``` + +## Install + +```bash +cp devilution.exe /path/to/diablo_game_dir/ +``` + +## Run + +```bash +wine devilution.exe +``` diff --git a/INSTALL_windows.md b/INSTALL_windows.md new file mode 100644 index 0000000..4abfe69 --- /dev/null +++ b/INSTALL_windows.md @@ -0,0 +1,27 @@ +# Installation + +## Dependencies + +* Install [MSYS2](https://www.msys2.org/) + +```bash +# Start the *MSYS2 MinGW 32-bit* terminal. +pacman -Sy git make mingw-w64-i686-gcc mingw-w64-i686-binutils +ln -s /mingw32/i686-w64-mingw32/bin/dlltool.exe /usr/bin/i686-w64-mingw32-dlltool.exe +``` + +## Building + +```bash +git clone https://github.com/galaxyhaxz/devilution +cd devilution +cp /path/to/diablo_game_dir/diabloui.dll . +cp /path/to/diablo_game_dir/storm.dll . +make +``` + +## Install + +```bash +cp devilution.exe /path/to/diablo_game_dir/ +``` diff --git a/README.md b/README.md index 6bbf50f..588d65a 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,11 @@ There are two configurations: Debug and Release. The Debug version will compile There are currently three options defined in types.h. You can compile without copy protection, compile with debugger support, and compile with CPU throttling. The last option will sleep the main program loop to keep Diablo from using 100% CPU on modern computers. +For further installation and run instructions, refer to the respective documentation: + +* [Linux installation](INSTALL_linux.md) +* [Windows installation](INSTALL_windows.md) + # Contributing Currently there are a few issues with the decompiled code. Most of them are outlined in the TODO file. If you wish to contribute, small changes to help fix as many issues possible until everything is perfect and identical to the original game. Currently only Diablo.exe has been reversed, I have not yet started on the other files. Those are: - Battle.snp: code for battle.net, outdated protocol and not worth the time. From e12630c089f27c65398dd270cacbf15c282f293b Mon Sep 17 00:00:00 2001 From: mewmew Date: Fri, 8 Jun 2018 20:19:45 +0200 Subject: [PATCH 2/2] install: add note that pacman is for Arch Linux --- INSTALL_linux.md | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL_linux.md b/INSTALL_linux.md index 5bb83ff..5add5c2 100644 --- a/INSTALL_linux.md +++ b/INSTALL_linux.md @@ -2,6 +2,7 @@ ## Dependencies +Arch Linux: ```bash pacman -Sy mingw-w64-gcc mingw-w64-binutils ```