Skip to content

Commit de083fb

Browse files
committed
No longer get older version of zlib for macOS and update readme
1 parent 66dd1fe commit de083fb

File tree

2 files changed

+11
-29
lines changed

2 files changed

+11
-29
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,7 @@ jobs:
122122
sudo ${{ github.workspace }}/macports-cache/bin/port selfupdate
123123
sudo ${{ github.workspace }}/macports-cache/bin/port install cmake
124124
echo "macosx_deployment_target 12.4" | sudo tee -a ${{ github.workspace }}/macports-cache/etc/macports/macports.conf > /dev/null
125-
sudo ${{ github.workspace }}/macports-cache/bin/port install libsdl2 libsdl2_image libpng webp jpeg tiff +universal
126-
# The latest zlib version is not compatible with the game so we need to install an older version
127-
cd ..
128-
git clone --single-branch https://github.com/macports/macports-ports.git
129-
cd macports-ports
130-
git checkout a9dc453e0037f30ceccdab1c649e168e66738531
131-
cd archivers/zlib
132-
sudo ${{ github.workspace }}/macports-cache/bin/port install +universal
125+
sudo ${{ github.workspace }}/macports-cache/bin/port install libsdl2 libsdl2_image libpng webp jpeg tiff zlib +universal
133126
134127
- name: Build
135128
run: |

README.md

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FreeBSD 4.7, Raspberry Pi OS and Nintendo Switch.
1212

1313
Improvements over the original Ken's Labyrinth:
1414

15-
- Runs natively on 32-bit/64-bit Windows, Unix or Nintendo Switch.
15+
- Runs natively on 32-bit/64-bit Intel/ARM Windows, macOS, Unix or Nintendo Switch.
1616
- Supports big-endian CPUs.
1717
- Uses OpenGL to provide hardware accelerated, anti-aliased graphics with
1818
trilinear interpolation in true colour (where available).
@@ -60,7 +60,7 @@ Makefiles require GNU Make (or compatible) and sh (or compatible, e.g. bash). Cm
6060

6161
## Linux
6262

63-
Before the game will run you will need to install SDL2 and SDL2_Image runtime binaries on your system.
63+
Before the game will run you will need to install the SDL2, SDL2_Image and GLU shared libraries on your system.
6464

6565
Run the following commands:
6666

@@ -71,19 +71,7 @@ sudo apt install libsdl2-2.0-0 libsdl2-image-2.0-0 libglu1-mesa
7171

7272
## macOS
7373

74-
Before the game will run you will need to install SDL2 and SDL2_Image runtime binaries on your system.
75-
76-
- Install ["Macports"](https://www.macports.org/install.php) or ["Homebrew](https://brew.sh/) if you haven't already.
77-
- If you plan to build a universal macOS app (meaning the same binary can be run on both Apple Silicon and Intel Macs) then you **MUST** get the universal version of the SDL2 libraries and this is only available on Macports. Homebrew doesn't support universal packages.
78-
79-
- If you're using Macports, run the following command:
80-
```
81-
sudo port install libsdl2 libsdl2_image +universal
82-
```
83-
- Otherwise run this if you are using Homebrew:
84-
```
85-
brew install sdl2 sdl2_image
86-
```
74+
All required libraries and data are bundled in the app. Open the .dmg file, drag the app to the Applications folder, then launch it.
8775

8876
## Nintendo Switch
8977

@@ -164,14 +152,14 @@ Run "make -f Makefile.Win32" in the source directory. MinGW 3.1.0 is
164152
recommended for Windows use.
165153

166154
## macOS
167-
If you plan to build a universal macOS app (meaning the same binary can be run on both Apple Silicon and Intel Macs) then you **MUST** get the universal version of the SDL2 libraries and this is only available on Macports. Homebrew doesn't support universal packages.
155+
If you plan to build a universal macOS app (meaning the same binary can be run on both Apple Silicon and Intel Macs) then you **MUST** get the universal version of the libraries and this is only available on Macports. Homebrew doesn't support universal packages.
168156

169157
- Install ["Macports"](https://www.macports.org/install.php) if you haven't already.
170158

171159
- Run the following command:
172160
```
173161
sudo echo "macosx_deployment_target 12.4" >> /opt/local/etc/macports/macports.conf
174-
sudo port install libsdl2 libsdl2_image +universal
162+
sudo port install libsdl2 libsdl2_image libpng webp jpeg tiff zlib +universal
175163
```
176164

177165
- In the project root run the following commands:
@@ -185,16 +173,17 @@ Now choose a build method:
185173
- Simple build
186174
```
187175
cmake ..
188-
make
176+
cmake --build . --config Release
189177
```
190178

191179
- Build via Xcode (recommended if you want to properly customise the build for code signing etc):
192180
```
193181
cmake -G Xcode ..
182+
cmake --build . --config Release
194183
```
195184
Then open the project in Xcode and build it.
196185

197-
The app `Kens-Labyrinth` will be copied to the build folder. You may move this to your Applications folder.
186+
The app `Kens-Labyrinth` will be copied to dist/macOS. You may move this to your Applications folder.
198187

199188

200189
## Linux/UNIX
@@ -210,10 +199,10 @@ In the project root run the following commands:
210199
mkdir build
211200
cd build
212201
cmake ..
213-
make
202+
cmake --build . --config Release
214203
```
215204

216-
The executable `ken` and its dependencies will be copied to the build folder.
205+
The executable `ken` and its dependencies will be copied dist/linux.
217206

218207
## Unix with OSS support (Legacy)
219208

0 commit comments

Comments
 (0)