From 8820a60e019e809411e999c7d6b36e07e970a112 Mon Sep 17 00:00:00 2001
From: dob205 <dominik.babic0@gmail.com>
Date: Fri, 19 Nov 2021 13:40:35 +0100
Subject: [PATCH 1/2] Loading macOSXglue.m and macOSXglue.h

Enables to store the ROMs in "Application Support" on macOS, can be extended later into storage of global configuration files
---
 src/86box.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/86box.c b/src/86box.c
index 908bef06f..89ff01e25 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -33,6 +33,7 @@
 #ifdef __APPLE__
 #include <string.h>
 #include <dispatch/dispatch.h>
+#include "mac/macOSXGlue.h"
 #ifdef __aarch64__
 #include <pthread.h>
 #endif
@@ -393,6 +394,7 @@ pc_init(int argc, char *argv[])
 {
 	char path[2048], path2[2048];
 	char *cfg = NULL, *p;
+	char mac_rom_path[2048];
 	char temp[128];
 	struct tm *info;
 	time_t now;
@@ -585,14 +587,14 @@ usage:
 			plat_dir_create(usr_path);
 	}
 
+	#ifdef __APPLE__
+		getDefaultROMPath(mac_rom_path);
+		strcpy(path2, mac_rom_path);
+	#endif
 	if (vmrp && (path2[0] == '\0')) {
-#ifdef __APPLE__
-		sprintf("%s/Library/Application Support/86Box/roms", getenv("HOME") ? getenv("HOME") : getpwuid(getuid())->pw_dir);
-#else
 		strcpy(path2, usr_path);
 		plat_path_slash(path2);
 		strcat(path2, "roms");
-#endif
 		plat_path_slash(path2);
 	}
 

From 469a9d0b7a5a9ad4f5140761868b5867a5dc6df6 Mon Sep 17 00:00:00 2001
From: dob205 <dominik.babic0@gmail.com>
Date: Fri, 19 Nov 2021 13:44:53 +0100
Subject: [PATCH 2/2] Adds the macOSXglue.m into the compilation process

Enables to get the macOSXglue up and running while compiling 86Box on macOS, also executes some functions related to macOS now not on Windows and Linux anymore
---
 src/CMakeLists.txt | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fde99e3f0..1acfa8260 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,24 +16,33 @@
 #
 
 # Prepare the macOS app bundle icon depending on the release channel
-if(RELEASE_BUILD)
-	set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/release/86Box.icns)
-elseif(BETA_BUILD)
-	set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/beta/86Box.icns)
-elseif(ALPHA_BUILD)
-	set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/dev/86Box.icns)
-else()
-	set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/branch/86Box.icns)
-endif()
+set(APP_ICON_MACOSX)
+if (APPLE)
+	if(RELEASE_BUILD)
+		set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/release/86Box.icns)
+	elseif(BETA_BUILD)
+		set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/beta/86Box.icns)
+	elseif(ALPHA_BUILD)
+		set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/dev/86Box.icns)
+	else()
+		set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/branch/86Box.icns)
+	endif()
 
 set_source_files_properties(${APP_ICON_MACOSX} PROPERTIES
         MACOSX_PACKAGE_LOCATION "Resources")
+endif()
+
+#Adding the macOS glue for ROM paths
+set(MAC_GLUE)
+if (APPLE)
+    set(MAC_GLUE ${CMAKE_CURRENT_SOURCE_DIR}/mac/macOSXGlue.m)
+endif()
         
 # WIN32 marks us as a GUI app on Windows
 # MACOSX_BUNDLE prepares a macOS application bundle including with the app icon
 add_executable(86Box WIN32 MACOSX_BUNDLE 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
 	dma.c ddma.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c
-	device.c nvr.c nvr_at.c nvr_ps2.c ${APP_ICON_MACOSX})
+	device.c nvr.c nvr_at.c nvr_ps2.c ${APP_ICON_MACOSX} ${MAC_GLUE})
  
 if(NEW_DYNAREC)
 	add_compile_definitions(USE_NEW_DYNAREC)
@@ -184,7 +193,6 @@ endif()
 if(APPLE)
 	set(APPS ${CMAKE_CURRENT_BINARY_DIR}/86Box.app)
 	install(CODE "
-        	include(InstallRequiredSystemLibraries)
         	include(BundleUtilities)
         	fixup_bundle(\"${APPS}\" \"\" \"\")"
     	COMPONENT Runtime)