Skip to content

Commit c3ffbf0

Browse files
authored
Fix MSYS2 build instructions (#632)
* make: Have rules for both with .exe and without * BUILD: Add diffutils as dependency
1 parent af361dd commit c3ffbf0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

BUILD.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ You need these things at minimum to compile the game:
55

66
- a C compiler (Clang or GCC)
77
- Make
8+
- diffutils (cmp)
89

910
You will also need additional dependencies based on the build options you select.
1011
You can see the options and their requirements in `config.mk`. You can configure
@@ -23,13 +24,13 @@ tested by the author and is relatively simple.
2324

2425
### Setting up
2526

26-
1. Install [MSYS2][1] for x86_64. Refer to [its wiki][2] for essential info
27+
1. Install [MSYS2][1] for x86_64. Refer to the website for essential info
2728
on how to use it.
2829

2930
2. (Installing the dependencies) Open the MSYS2 shell and run the following:
3031

3132
```
32-
pacman -S make mingw-w64-x86_64-{gcc,SDL2,SDL2_image}
33+
pacman -S make diffutils mingw-w64-x86_64-{gcc,SDL2,SDL2_image}
3334
```
3435
3536
### Building
@@ -100,7 +101,7 @@ These instructions are for the graphical version only.
100101
1. Install the dependencies; for example, on Debian/Ubuntu, run
101102
102103
```
103-
sudo apt install make gcc libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev
104+
sudo apt install make gcc diffutils libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev
104105
```
105106
106107
### Building
@@ -113,6 +114,5 @@ These instructions are for the graphical version only.
113114
114115
115116
[1]: https://www.msys2.org/
116-
[2]: https://github.com/msys2/msys2/wiki
117117
[3]: https://www.java.com/en/download/help/path.xml
118118
[4]: https://brew.sh/

make/brogue.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
bin/brogue$(.exe): $(objects) vars/cflags vars/LDFLAGS vars/libs vars/objects make/brogue.mk
1+
bin/brogue bin/brogue.exe: $(objects) vars/cflags vars/LDFLAGS vars/libs vars/objects make/brogue.mk
22
$(CC) $(cflags) $(LDFLAGS) -o $@ $(objects) $(libs)
33
# on windows, embedding the manifest modifies the executable, preventing debugging
44
ifeq ($(SYSTEM),WINDOWS)

0 commit comments

Comments
 (0)