Merge branch '86Box:master' into translation_hu-HU

src/CMakeLists.txt

@@ -9,15 +9,32 @@
 #		CMake build script.
 #
 # Authors:	David Hrdlička, <hrdlickadavid@outlook.com>
+#		dob205
 #
 #		Copyright 2020,2021 David Hrdlička.
+#		Copyright 2021 dob205.
 #
 
-# WIN32 marks us as a GUI app on Windows
+# Prepare the macOS app bundle icon depending on the release channel
-add_executable(86Box WIN32 86box.c config.c random.c timer.c io.c acpi.c apm.c
+if(RELEASE_BUILD)
-	dma.c ddma.c nmi.c pic.c pit.c port_92.c ppi.c pci.c mca.c usb.c
+	set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/mac/icons/release/86Box.icns)
-	device.c nvr.c nvr_at.c nvr_ps2.c)
+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")
+        
+# 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 random.c timer.c io.c acpi.c apm.c
+	dma.c ddma.c nmi.c pic.c pit.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})
+ 
 if(NEW_DYNAREC)
 	add_compile_definitions(USE_NEW_DYNAREC)
 endif()
@@ -63,13 +80,41 @@ if(MINGW)
 	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".dll.a")
 endif()
 
+#some macOS specific configuration steps
 if(APPLE)
-	# Force using the newest library if it's installed by homebrew
+  # Force using the newest library if it's installed by homebrew
-	set(CMAKE_FIND_FRAMEWORK LAST)
+  set(CMAKE_FIND_FRAMEWORK LAST)
+  
+  # prepare stuff for macOS app bundles
+  set(CMAKE_MACOSX_BUNDLE 1)
+
+  # setting our compilation target to macOS Mojave (macOS version 10.14), can be eventually changed to macOS 10.13 High Sierra
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
+  
+  # set the Info.plist properly
+  set_target_properties(86Box PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist.in)
+  set(MACOSX_BUNDLE_GUI_IDENTIFIER net.86Box.86Box)
+  set(MACOSX_BUNDLE_BUNDLE_NAME 86Box)
+  set(MACOSX_BUNDLE_BUNDLE_VERSION 3.0)
+  set(MACOSX_BUNDLE_SHORT_VERSION_STRING "3.0")
+  set(MACOSX_BUNDLE_LONG_VERSION_STRING "3.0.0")
+  set(MACOSX_BUNDLE_ICON_FILE 86Box.icns)
+  set(MACOSX_BUNDLE_INFO_STRING "A emulator of old computers")
+  set(MACOSX_BUNDLE_COPYRIGHT "© 2007-2021 Sarah Walker, Miran Grča, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others")
+
+  
+  # preparing the code signing for easier distribution, Apple dev certificate needed at one point
+  #set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
+  #set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
+  #set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)
+  
 endif()
 
 find_package(Freetype REQUIRED)
 include_directories(${FREETYPE_INCLUDE_DIRS})
+if(APPLE)
+	target_link_libraries(86Box Freetype::Freetype) # bundles freetype for the macOS app bundle
+endif()
 
 find_package(OpenAL REQUIRED)
 include_directories(${OPENAL_INCLUDE_DIR})
@@ -119,7 +164,23 @@ if(MINITRACE)
     target_link_libraries(86Box minitrace)
 endif()
 
-install(TARGETS 86Box)
+if(APPLE)
+	install(TARGETS 86Box DESTINATION "bin")
+else()
+	install(TARGETS 86Box)
+endif()
+
+
+# adjustments for macOS app bundles
+if(APPLE)
+	set(APPS ${CMAKE_CURRENT_BINARY_DIR}/86Box.app)
+	install(CODE "
+        	include(InstallRequiredSystemLibraries)
+        	include(BundleUtilities)
+        	fixup_bundle(\"${APPS}\" \"\" \"\")"
+    	COMPONENT Runtime)
+endif()
+
 if(VCPKG_TOOLCHAIN)
 	x_vcpkg_install_local_dependencies(TARGETS 86Box DESTINATION "bin")
 endif()

src/config.c

@@ -2318,9 +2318,8 @@ save_machine(void)
       else
 	config_set_string(cat, "fpu_type", (char *) fpu_get_internal_name(cpu_f, cpu, fpu_type));
 
-    if (mem_size == 4096)
+    //Write the mem_size explicitly to the setttings in order to help managers to display it without having the actual machine table
 	config_delete_var(cat, "mem_size");
-      else
 	config_set_int(cat, "mem_size", mem_size);
 
     config_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec);

src/floppy/fdd.c

@@ -497,7 +497,7 @@ fdd_load(int drive, char *fn)
 	while (loaders[c].ext) {
 		if (!strcasecmp(p, (char *) loaders[c].ext) && (size == loaders[c].size || loaders[c].size == -1)) {
 			driveloaders[drive] = c;
-			strcpy(floppyfns[drive], fn);
+			if (floppyfns[drive] != fn) strcpy(floppyfns[drive], fn);
 			d86f_setup(drive);
 			loaders[c].load(drive, floppyfns[drive]);
 			drive_empty[drive] = 0;

src/mac/Info.plist.in

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
+</dict>
+</plist>

src/win/win_discord.c

@@ -96,12 +96,24 @@ discord_update_activity(int paused)
 
     activity.timestamps.start = time(NULL);
 
+/* Icon choosing for Discord based on 86Box.rc */
+
 #ifdef RELEASE_BUILD
-    strcpy(activity.assets.large_image, "86box-rb");
+/* Icon by OBattler and laciba96 (green for release builds)*/
+    strcpy(activity.assets.large_image, "86box-green");
+#elif BETA_BUILD
+/* Icon by OBattler and laciba96 (yellow for beta builds done by Jenkins)*/
+    strcpy(activity.assets.large_image, "86box-yellow");
+#elif ALPHA_BUILD
+/* Icon by OBattler and laciba96 (red for alpha builds done by Jenkins)*/
+    strcpy(activity.assets.large_image, "86box-red");
 #else
+/* Icon by OBattler and laciba96 (gray for builds of branches and from the git master)*/
     strcpy(activity.assets.large_image, "86box");
 #endif
 
+/* End of icon choosing */
+
     if (paused)
     {
 	strcpy(activity.assets.small_image, "status-paused");