Minor resource reorg

CMakeLists.txt

@@ -81,6 +81,9 @@ endif()
 
 if(GOLD)
 	add_definitions(-DGOLD)
+	message("Gold Build")
+else()
+	message("Normal Build")
 endif()
 
 # Doesn't link on some platforms

UI/DevScreens.cpp

@@ -358,9 +358,6 @@ void SystemInfoScreen::CreateViews() {
 	deviceSpecs->Add(new InfoItem("Name", System_GetProperty(SYSPROP_NAME)));
 	deviceSpecs->Add(new InfoItem("Lang/Region", System_GetProperty(SYSPROP_LANGREGION)));
 	deviceSpecs->Add(new InfoItem("ABI", GetCompilerABI()));
-#ifdef JENKINS
-	deviceSpecs->Add(new InfoItem("Built by", "Jenkins"));
-#endif
 	deviceSpecs->Add(new ItemHeader("CPU Information"));
 	deviceSpecs->Add(new InfoItem("Name", cpu_info.brand_string));
 #if defined(ARM) || defined(ARM64) || defined(MIPS)
@@ -445,6 +442,9 @@ void SystemInfoScreen::CreateViews() {
 	tabHolder->AddTab("Build Config", buildConfigScroll);
 
 	buildConfig->Add(new ItemHeader("Build Configuration"));
+#ifdef JENKINS
+	buildConfig->Add(new InfoItem("Built by", "Jenkins"));
+#endif
 #ifdef _DEBUG
 	buildConfig->Add(new InfoItem("_DEBUG", ""));
 #else
@@ -456,6 +456,9 @@ void SystemInfoScreen::CreateViews() {
 #ifdef MOBILE_DEVICE
 	buildConfig->Add(new InfoItem("MOBILE_DEVICE", ""));
 #endif
+#ifdef GOLD
+	buildConfig->Add(new InfoItem("GOLD", ""));
+#endif
 
 	ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
 	cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt");

Windows/MainWindow.cpp

@@ -126,7 +126,6 @@ namespace MainWindow
 	bool noFocusPause = false;	// TOGGLE_PAUSE state to override pause on lost focus
 
 #define MAX_LOADSTRING 100
-	const TCHAR *szTitle = TEXT("PPSSPP");
 	const TCHAR *szWindowClass = TEXT("PPSSPPWnd");
 	const TCHAR *szDisplayClass = TEXT("PPSSPPDisplay");
 

Windows/MainWindowMenu.cpp

@@ -1273,7 +1273,11 @@ namespace MainWindow {
 		{
 			W32Util::CenterWindow(hDlg);
 			HWND versionBox = GetDlgItem(hDlg, IDC_VERSION);
+#ifdef GOLD
 			std::string windowText = "PPSSPP ";
+#else
+			std::string windowText = "PPSSPP Gold ";
+#endif
 			windowText.append(PPSSPP_GIT_VERSION);
 			SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str());
 		}

Windows/WindowsHost.cpp

@@ -150,7 +150,12 @@ void WindowsHost::ShutdownGraphics() {
 }
 
 void WindowsHost::SetWindowTitle(const char *message) {
-	std::wstring winTitle = ConvertUTF8ToWString(std::string("PPSSPP ") + PPSSPP_GIT_VERSION);
+#ifdef GOLD
+	const char *name = "PPSSPP ";
+#else
+	const char *name = "PPSSPP Gold ";
+#endif
+	std::wstring winTitle = ConvertUTF8ToWString(std::string(name) + PPSSPP_GIT_VERSION);
 	if (message != nullptr) {
 		winTitle.append(ConvertUTF8ToWString(" - "));
 		winTitle.append(ConvertUTF8ToWString(message));

android/build.gradle

@@ -55,7 +55,9 @@ android {
 			]
 			jni.srcDirs = ['..']
 		}
-
+		gold {
+			res.srcDirs = ['gold/res']
+		}
 	}
 	productFlavors {
 		normal {

android/gold/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PPSSPP Gold</string>
+</resources>