2.2.0 update

Author: devwizard64

.gitignore

@@ -1,4 +1,4 @@
+/donor/
 build/
 __pycache__/
 *.pyc
-*.z64

README.md

@@ -1,5 +1,5 @@
 # SM64Net - An Internet framework for SM64
-Copyright (C) 2019 - 2021  devwizard
+Copyright (C) 2019 - 2022  devwizard
 
 This project is licensed under the terms of the GNU General Public License
 version 2.  See `LICENSE` for more information.
@@ -32,7 +32,7 @@ Use WSL to compile the server on Windows.
 
 ### Dependencies (Server)
 * `apt install make gcc-mips-linux-gnu`
-* `pip install windows-curses`
+* `pip install windows-curses` **(Windows)**
 
 ## Client
 
@@ -51,4 +51,4 @@ Use WSL to compile the server on Windows.
 
 ### Dependencies
 * `apt install make gcc gcc-mips-linux-gnu libftdi1-dev`
-* An English SM64 ROM - Name it `UNSME0.z64` and place it in `usb/`.
+* An English SM64 ROM - Name it `UNSME0.z64` and place it in `donor/`.

client/makefile

@@ -1,45 +1,19 @@
 #                   SM64Net - An Internet framework for SM64
-#                     Copyright (C) 2019 - 2021  devwizard
+#                     Copyright (C) 2019 - 2022  devwizard
 #         This project is licensed under the terms of the GNU General
 #         Public License version 2.  See LICENSE for more information.
 
-VERSION 	:= 2.1
-REVISION	:= 0
+.PHONY: default
+default: build/sm64net build/sm64net.exe build/sm64net_usb
 
-CC      := cc
-CCFLAG  := -I ../include -D _VERSION=\"$(VERSION)\" -D _REVISION=\"$(REVISION)\"
-CCFLAG  += -D _NATIVE -Wall -Wextra -Wpedantic -O2
-
-OBJ := \
-	build/sm64net       \
-	build/sm64net_usb   \
-	build/sm64net.exe   \
-	build/SM64NetLauncher.exe
-
-default: $(OBJ)
-
-SRC := src/client/main.c src/client/mem.c src/client/net.c
+SRC := src/main.c src/net.c src/mem.c
 build/sm64net: $(SRC)
-build/sm64net.exe: CC  := i686-w64-mingw32-gcc -mconsole -D _WIN32_WINNT=0x0600
-build/sm64net.exe: LIB := -l ws2_32
 build/sm64net.exe: $(SRC)
+build/sm64net.exe: CC  := i686-w64-mingw32-gcc -mconsole -D_WIN32_WINNT=0x0600
+build/sm64net.exe: LIB := -lws2_32
 
-SRC := src/client/main.c src/client/mem_usb.c src/client/net.c
-build/sm64net_usb: LIB := -l ftdi
+SRC := src/main.c src/net.c src/mem_usb.c
 build/sm64net_usb: $(SRC)
+build/sm64net_usb: LIB := -lftdi
 
-SRC := src/launcher/main.c src/launcher/window.c src/launcher/config.c
-build/SM64NetLauncher.exe: CC  := i686-w64-mingw32-gcc -mwindows
-build/SM64NetLauncher.exe: LIB := -l comctl32
-build/SM64NetLauncher.exe: $(SRC)
-
-build/%: | build
-	@$(CC) $(CCFLAG) -o $@ $^ $(LIB)
-
-build:
-	@mkdir -p $@
-
-clean:
-	@rm -rf build
-
-.PHONY: default clean
+include ../include/native.mk