Merge pull request #1847 from jvernet/master

MacOsX Compilation fixed

src/86box.c

@@ -148,24 +148,24 @@ int video_vsync = 0;				/* (C) video */
 int video_framerate = -1;			/* (C) video */
 char video_shader[512] = { '\0' };		/* (C) video */
 int	serial_enabled[SERIAL_MAX] = {0,0};	/* (C) enable serial ports */
-int bugger_enabled = 0;			/* (C) enable ISAbugger */
+int bugger_enabled = 0;				/* (C) enable ISAbugger */
 int postcard_enabled = 0;			/* (C) enable POST card */
 int isamem_type[ISAMEM_MAX] = { 0,0,0,0 };	/* (C) enable ISA mem cards */
-int isartc_type = 0;			/* (C) enable ISA RTC card */
+int isartc_type = 0;				/* (C) enable ISA RTC card */
 int	gfxcard = 0;				/* (C) graphics/video card */
 int	sound_is_float = 1;			/* (C) sound uses FP values */
-int GAMEBLASTER = 0;			/* (C) sound option */
-int GUS = 0;				/* (C) sound option */
+int GAMEBLASTER = 0;				/* (C) sound option */
+int GUS = 0;					/* (C) sound option */
 int SSI2001 = 0;				/* (C) sound option */
-int voodoo_enabled = 0;			/* (C) video option */
+int voodoo_enabled = 0;				/* (C) video option */
 uint32_t mem_size = 0;				/* (C) memory size */
 int	cpu_use_dynarec = 0;			/* (C) cpu uses/needs Dyna */
-int cpu = 0;				/* (C) cpu type */
+int cpu = 0;					/* (C) cpu type */
 int fpu_type = 0;				/* (C) fpu type */
 int	time_sync = 0;				/* (C) enable time sync */
 int	confirm_reset = 1;			/* (C) enable reset confirmation */
-int confirm_exit = 1;			/* (C) enable exit confirmation */
-int confirm_save = 1;			/* (C) enable save confirmation */
+int confirm_exit = 1;				/* (C) enable exit confirmation */
+int confirm_save = 1;				/* (C) enable save confirmation */
 #ifdef USE_DISCORD
 int	enable_discord = 0;			/* (C) enable Discord integration */
 #endif
@@ -189,7 +189,7 @@ char	usr_path[1024];				/* path (dir) of user data */
 char	cfg_path[1024];				/* full path of config file */
 FILE	*stdlog = NULL;				/* file to log output to */
 int	scrnsz_x = SCREEN_RES_X;		/* current screen size, X */
-int scrnsz_y = SCREEN_RES_Y;		/* current screen size, Y */
+int scrnsz_y = SCREEN_RES_Y;			/* current screen size, Y */
 int	config_changed;				/* config has changed */
 int	title_update;
 int	framecountx = 0;
@@ -419,6 +419,9 @@ pc_init(int argc, char *argv[])
 	plat_getcwd(usr_path, sizeof(usr_path) - 1);
 	plat_getcwd(rom_path, sizeof(rom_path) - 1);
 
+	printf("JV:usr_path %s\n",usr_path);
+	printf("JV:rom_path %s\n",usr_path);
+	
 	memset(path, 0x00, sizeof(path));
 	memset(path2, 0x00, sizeof(path));
 
@@ -587,6 +590,7 @@ usage:
 			plat_dir_create(usr_path);
 	}
 
+
 	#ifdef __APPLE__
 		getDefaultROMPath(mac_rom_path);
 		strcpy(path2, mac_rom_path);

src/CMakeLists.txt

@@ -95,9 +95,12 @@ endif()
 
 #some macOS specific configuration steps
 if(APPLE)
-  # Force using the newest library if it's installed by homebrew
+  find_library(COCOA_LIBRARY Cocoa)
+  target_link_libraries (86Box ${COCOA_LIBRARY} )  
+# Force using the newest library if it's installed by homebrew
   set(CMAKE_FIND_FRAMEWORK LAST)
   
+
   # prepare stuff for macOS app bundles
   set(CMAKE_MACOSX_BUNDLE 1)
 
@@ -224,7 +227,10 @@ add_subdirectory(sio)
 add_subdirectory(scsi)
 add_subdirectory(sound)
 add_subdirectory(video)
-if (WIN32)
+if(APPLE)
+	add_subdirectory(mac)
+	add_subdirectory(unix)
+elseif(WIN32)
 	add_subdirectory(win)
 else()
 	add_subdirectory(unix)

src/mac/CMakeLists.txt

@@ -0,0 +1,3 @@
+include_directories("./mac")
+target_sources(86Box PUBLIC "./macOSXGlue.m")
+