From b09526607026fa4964150193e77df7afb6c34a2d Mon Sep 17 00:00:00 2001
From: Shpoike <Shpoike@users.noreply.github.com>
Date: Thu, 19 Jan 2023 04:07:35 +0000
Subject: [PATCH] Fix cmake-on-mac build errors.

---
 CMakeLists.txt          | 3 +++
 engine/client/in_sdl.c  | 5 +++--
 engine/client/sys_sdl.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a991a50b2..945076eb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,6 +133,7 @@ ENDIF()
 
 FIND_PACKAGE(JPEG)
 IF(JPEG_FOUND)
+	INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIRS} )
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};LIBJPEG_STATIC)
 	SET(FTE_LIBS ${FTE_LIBS} ${JPEG_LIBRARIES})
 ELSE()
@@ -142,6 +143,7 @@ ENDIF()
 
 FIND_PACKAGE(PNG)
 IF(PNG_FOUND)
+	INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIRS} )
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};LIBPNG_STATIC)
 	SET(FTE_LIBS ${FTE_LIBS} ${PNG_LIBRARIES})
 ELSE()
@@ -169,6 +171,7 @@ ENDIF()
 
 FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile)
 IF(NOT VORBISFILE_LIBRARY)
+	INCLUDE_DIRECTORIES( ${VORBISFILE_INCLUDE_DIRS} )
 	MESSAGE(WARNING "libvorbisfile library NOT available. Who listens to the bgm anyway?")
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_OGG)
 ENDIF()
diff --git a/engine/client/in_sdl.c b/engine/client/in_sdl.c
index 866dfe28b..4421d3e2d 100644
--- a/engine/client/in_sdl.c
+++ b/engine/client/in_sdl.c
@@ -491,7 +491,7 @@ static void J_ControllerSensor(SDL_JoystickID jid, SDL_SensorType sensor, float
 	if (joy->qdevid == DEVID_UNSET)
 		return;
 
-	safeswitch(sensor)
+	switch(sensor)
 	{
 	case SDL_SENSOR_ACCEL:
 		IN_Accelerometer(joy->qdevid, data[0], data[1], data[2]);
@@ -499,9 +499,10 @@ static void J_ControllerSensor(SDL_JoystickID jid, SDL_SensorType sensor, float
 	case SDL_SENSOR_GYRO:
 		IN_Gyroscope(joy->qdevid, data[0], data[1], data[2]);
 		break;
+
 	case SDL_SENSOR_INVALID:
 	case SDL_SENSOR_UNKNOWN:
-	safedefault:
+	default:
 		break;
 	}
 }
diff --git a/engine/client/sys_sdl.c b/engine/client/sys_sdl.c
index 74e0a8736..7ec6912a6 100644
--- a/engine/client/sys_sdl.c
+++ b/engine/client/sys_sdl.c
@@ -11,7 +11,7 @@
 #ifndef WIN32
 #include <fcntl.h>
 #include <sys/stat.h>
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))	//apple make everything painful.
 #include <unistd.h>
 #endif
 #else