Merge pull request #17307 from hrydgard/gold-mac

Mac: Add gold icon and cmake option

CMakeLists.txt

@@ -2490,11 +2490,18 @@ endif()
 if(TargetBin)
 	if(APPLE)
 		if(NOT IOS)
-			set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns)
-			set(MACOSX_BUNDLE_ICON_FILE ppsspp.icns)
+			if(GOLD)
+				set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp_gold.icns)
+				set(MACOSX_BUNDLE_ICON_FILE ppsspp_gold.icns)
+				set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP Gold")
+				set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppssppgold)
+			else()
+				set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns)
+				set(MACOSX_BUNDLE_ICON_FILE ppsspp.icns)
+				set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP")
+				set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppsspp)
+			endif()
 			set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-			set(MACOSX_BUNDLE_BUNDLE_NAME PPSSPP)
-			set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppsspp)
 		endif()
 
 		# TODO: there must a native way to copy these.
@@ -2505,7 +2512,7 @@ if(TargetBin)
 		file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
 		file(GLOB_RECURSE THEME_FILE assets/themes/*)
 		file(GLOB_RECURSE DEBUGGER_FILES assets/debugger/*)
-                file(GLOB_RECURSE VFPU_FILES assets/vfpu/*)
+		file(GLOB_RECURSE VFPU_FILES assets/vfpu/*)
 
 		if(NOT IOS)
 			set_source_files_properties(${BigFontAssets} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets")
@@ -2515,7 +2522,7 @@ if(TargetBin)
 			set_source_files_properties(${SHADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/shaders")
 			set_source_files_properties(${THEME_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/themes")
 			set_source_files_properties(${DEBUGGER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/debugger")
-                        set_source_files_properties(${VFPU_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/vfpu")
+			set_source_files_properties(${VFPU_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/vfpu")
 		endif()
 
 		if(IOS)

SDL/SDLMain.cpp

@@ -236,7 +236,8 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	case SystemRequestType::SET_WINDOW_TITLE:
 	{
 		std::lock_guard<std::mutex> guard(g_mutexWindow);
-		g_windowState.title = param1.empty() ? "PPSSPP " : param1;
+		const char *app_name = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold" : "PPSSPP";
+		g_windowState.title = param1.empty() ? app_name : param1;
 		g_windowState.update = true;
 		return true;
 	}

UI/MiscScreens.cpp

@@ -912,8 +912,8 @@ void CreditsScreen::render() {
 	specialthankssolarmystic += cr->T("testing");
 	specialthankssolarmystic += ')';
 
-	const char * credits[] = {
-		"PPSSPP",
+	const char *credits[] = {
+		System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold" : "PPSSPP",
 		"",
 		cr->T("title", "A fast and portable PSP emulator"),
 		"",

Windows/main.cpp

@@ -476,11 +476,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	}
 	case SystemRequestType::SET_WINDOW_TITLE:
 	{
-#ifdef GOLD
-		const char *name = "PPSSPP Gold ";
-#else
-		const char *name = "PPSSPP ";
-#endif
+		const char *name = System_GetPropertyBool(SYSPROP_APP_GOLD) ? "PPSSPP Gold " : "PPSSPP ";
 		std::wstring winTitle = ConvertUTF8ToWString(std::string(name) + PPSSPP_GIT_VERSION);
 		if (!param1.empty()) {
 			winTitle.append(ConvertUTF8ToWString(" - " + param1));

b.sh

@@ -69,6 +69,9 @@ do
 		--sanitize) echo "Enabling address-sanitizer if available"
 			CMAKE_ARGS="-DUSE_ASAN=ON ${CMAKE_ARGS}"
 			;;
+		--gold) echo "Gold build enabled"
+			CMAKE_ARGS="-DGOLD=ON ${CMAKE_ARGS}"
+			;;
 		*) MAKE_OPT="$1 ${MAKE_OPT}"
 			;;
 	esac