Merge branch 'unstable' into dev/unstable

Makefile

@@ -465,7 +465,10 @@ ifeq ($(DISCORD_SDK), 1)
     endif
   else ifeq ($(OSX_BUILD),1)
     # needs testing
-    DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dylib
+    # HACKY! Instead of figuring out all of the dynamic library linking madness...
+    # I copied the library and gave it two names.
+    # This really shouldn't be required, but I got tired of trying to do it the "right way"
+    DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dylib lib/discordsdk/libdiscord_game_sdk.dylib
   else
     DISCORD_SDK_LIBS := lib/discordsdk/libdiscord_game_sdk.so
   endif
@@ -726,7 +729,7 @@ else ifeq ($(TARGET_RPI),1)
   LDFLAGS := $(OPT_FLAGS) -lm $(BACKEND_LDFLAGS) -no-pie
 
 else ifeq ($(OSX_BUILD),1)
-  LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
+  LDFLAGS := -lm $(BACKEND_LDFLAGS) -lpthread
 
 else
   LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -lm $(BACKEND_LDFLAGS) -no-pie -lpthread

src/pc/network/socket/socket_linux.h

@@ -6,6 +6,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #define SOCKET unsigned int
 #define INVALID_SOCKET (unsigned int)(-1)

tools/Makefile

@@ -1,6 +1,6 @@
 CC := gcc
 CXX := g++
-CFLAGS := -I../include -I. -Wall -Wextra -Wno-unused-parameter -pedantic -std=c99 -O2 -s
+CFLAGS := -I../include -I. -Wall -Wextra -Wno-unused-parameter -Wno-error=implicit-function-declaration -pedantic -std=c99 -O2 -s
 LDFLAGS := -lm
 PROGRAMS := n64graphics n64graphics_ci mio0 n64cksum textconv patch_libultra_math aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv