2.2.2 update

Author: devwizard64

.gitignore

@@ -1,4 +1,6 @@
 /donor/
+bin/
 build/
 __pycache__/
 *.pyc
+/server/save.bin

README.md

@@ -8,37 +8,32 @@ version 2.  See `LICENSE` for more information.
 This project provides a framework for developing modifications to *Super Mario
 64* that utilise an Internet connection.
 
-## How to use
-**If you are hosting a server,** follow the instructions for the server
-installation and usage.  Run the server on a separate machine as the client
-you join with, as running the client may cause interference with the server.
+## How to play
+Download the latest release from the
+[Releases](https://github.com/devwizard64/sm64net/releases/) tab.  Extract
+`SM64Net.zip`, then run `SM64NetGUI.exe`.  Fill out the information required,
+then click `Launch` while your emulator is running.
+
+We strongly recommend using [Parallel Launcher](https://parallel-launcher.ca/),
+as that works best with this project.  Before running, open the settings menu,
+then check `Show advanced ROM options`, then click OK.  Then, with your SM64 ROM
+selected, check `Use Interpreter Core`.
+**If you do not do this step, SM64Net will not work.**
+
+## Using the Server
+Use WSL to compile the server on Windows.  Run the server on a separate machine
+as the client you join with, as running the client may cause interference with
+the server.
 
-**If you are joining a server,** download the latest release from the Releases
-tab: https://github.com/devwizard64/sm64net/releases/ (`SM64Net.zip`) and follow
-the instructions below:
-
-We strongly recommend using the latest nightly build of Project64 from 64DD.com,
-as that works best with this project.  Download it here:
-https://64dd.org/downloads.html (Click the link that says `64DD.org Build
-[date]` to download it as a portable ZIP.)
-
-When running SM64Net for the first time on Windows, a dialogue box from Windows
-Firewall will appear asking you if you want to allow network access to SM64Net.
-Check **both** boxes on the bottom, then click 'Allow access.'
-
-## Server
-
-Use WSL to compile the server on Windows.
-
-### Dependencies (Server)
+### Dependencies
 * `apt install make gcc-mips-linux-gnu`
-* `pip install windows-curses` **(Windows)**
+* `pip install windows-curses` **(Windows, no WSL)**
 
-## Client
+## Using the Client
 
 ### Dependencies
 * `apt install make gcc` **(Native)**
-* `apt install make gcc-mingw-w64-i686` **(Windows cross-compile)**
+* `apt install make gcc-mingw-w64-x86-64` **(Windows cross-compile)**
 
 ### Usage
 `./sm64net <proc> <addr> <port> [nff ...]`
@@ -47,8 +42,8 @@ Use WSL to compile the server on Windows.
 * `port` - Server port, default is `4352`
 * `nff` - Optional NFF file to read, you may specify multiple
 
-## USB (experimental)
+## Using the USB Client (experimental)
 
 ### Dependencies
 * `apt install make gcc gcc-mips-linux-gnu libftdi1-dev`
-* An English SM64 ROM - Name it `UNSME0.z64` and place it in `donor/`.
+* An English SM64 ROM - Name it `UNSME00.z64` and place it in `donor/`.

client/makefile

@@ -3,13 +3,21 @@
 #         This project is licensed under the terms of the GNU General
 #         Public License version 2.  See LICENSE for more information.
 
-build/sm64net: src/main.c src/net.c src/mem.c
+.PHONY: default
+default: bin/sm64net bin/sm64net.exe bin/sm64net_usb
 
-build/sm64net.exe: src/main.c src/net.c src/mem.c
-build/sm64net.exe: CC  := i686-w64-mingw32-gcc -mconsole -D_WIN32_WINNT=0x0600
-build/sm64net.exe: LIB := -lws2_32
+include ../include/sm64net.mk
 
-build/sm64net_usb: src/main.c src/net.c src/mem_usb.c
-build/sm64net_usb: LIB := -lftdi
+W32_ARCH    := -mconsole -D_WIN32_WINNT=0x0600
 
-include ../include/native.mk
+bin/sm64net: src/main.c src/memory.c
+	@mkdir -p $(dir $@)
+	$(CC) $(CCFLAG) -s -o $@ $^
+
+bin/sm64net.exe: src/main.c src/memory.c
+	@mkdir -p $(dir $@)
+	$(W32_CC) $(W32_CCFLAG) -s -o $@ $^ -lws2_32
+
+bin/sm64net_usb: src/main.c src/memory_usb.c
+	@mkdir -p $(dir $@)
+	$(CC) $(CCFLAG) -s -o $@ $^ -lftdi