From 94221e2c62f2bc2b2a7fce02c9599578b23da627 Mon Sep 17 00:00:00 2001 From: Bronley Plumb Date: Sat, 30 Sep 2023 12:13:49 -0400 Subject: [PATCH 1/3] Improve windows build instructions --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 310865998..310a0e7e0 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,17 @@ N64 pad buttons X and Y (or `X_BUTTON`, `Y_BUTTON` in the code) refer to the res ### Windows -1. Install MSYS2. +1. Install [MSYS2[(https://www.msys2.org). 2. Open the MINGW32 prompt. 3. Install dependencies: `pacman -S mingw-w64-i686-toolchain mingw-w64-i686-SDL2 mingw-w64-i686-zlib make git` -4. Run `make -f Makefile.port` in the `perfect_dark` directory. -5. The resulting executable will be at `build/ntsc-final-port/pd.exe`. +4. clone the project: `git clone https://github.com/fgsfdsfgs/perfect_dark` +5. cd into the project: `cd perfect_dark` +6. Set HOST_PLATFORM to i686-windows in Makefile.port: `sed -i "s/^HOST_PLATFORM ?=.*$/HOST_PLATFORM ?= i686-windows/" Makefile.port` +7. Set a few environment variables (you can also add these to your `~/.bashrc` if you want them to stick around) + - `export PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:$PKG_CONFIG_PATH` + - `export PATH=/mingw32/bin/:$PATH` +7. Run `make -f Makefile.port` in the `perfect_dark` directory. +8. The resulting executable will be at `build/ntsc-final-port/pd.exe`. ### Linux From 603a879bdf3427ba3ceba235727af27b84a38e4e Mon Sep 17 00:00:00 2001 From: Bronley Plumb Date: Sat, 30 Sep 2023 12:36:55 -0400 Subject: [PATCH 2/3] Update README.md Add a note. Remove lots of stuff that wasn't actually necessary. --- README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 310a0e7e0..9adeb23e6 100644 --- a/README.md +++ b/README.md @@ -56,16 +56,10 @@ N64 pad buttons X and Y (or `X_BUTTON`, `Y_BUTTON` in the code) refer to the res ### Windows 1. Install [MSYS2[(https://www.msys2.org). -2. Open the MINGW32 prompt. +2. Open the MINGW32 prompt. (**NOTE:** _not_ the `msys2.exe` prompt) 3. Install dependencies: `pacman -S mingw-w64-i686-toolchain mingw-w64-i686-SDL2 mingw-w64-i686-zlib make git` -4. clone the project: `git clone https://github.com/fgsfdsfgs/perfect_dark` -5. cd into the project: `cd perfect_dark` -6. Set HOST_PLATFORM to i686-windows in Makefile.port: `sed -i "s/^HOST_PLATFORM ?=.*$/HOST_PLATFORM ?= i686-windows/" Makefile.port` -7. Set a few environment variables (you can also add these to your `~/.bashrc` if you want them to stick around) - - `export PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:$PKG_CONFIG_PATH` - - `export PATH=/mingw32/bin/:$PATH` -7. Run `make -f Makefile.port` in the `perfect_dark` directory. -8. The resulting executable will be at `build/ntsc-final-port/pd.exe`. +6. Run `make -f Makefile.port` in the `perfect_dark` directory. +7. The resulting executable will be at `build/ntsc-final-port/pd.exe`. ### Linux From e6a852ea8b15c8480b8d946aaa3e84bbfa4540ad Mon Sep 17 00:00:00 2001 From: Bronley Plumb Date: Sat, 30 Sep 2023 12:37:41 -0400 Subject: [PATCH 3/3] Update README.md fix numbers in list --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9adeb23e6..51605a448 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ N64 pad buttons X and Y (or `X_BUTTON`, `Y_BUTTON` in the code) refer to the res 1. Install [MSYS2[(https://www.msys2.org). 2. Open the MINGW32 prompt. (**NOTE:** _not_ the `msys2.exe` prompt) 3. Install dependencies: `pacman -S mingw-w64-i686-toolchain mingw-w64-i686-SDL2 mingw-w64-i686-zlib make git` -6. Run `make -f Makefile.port` in the `perfect_dark` directory. -7. The resulting executable will be at `build/ntsc-final-port/pd.exe`. +4. Run `make -f Makefile.port` in the `perfect_dark` directory. +5. The resulting executable will be at `build/ntsc-final-port/pd.exe`. ### Linux