Windows: Get rid of my private gold branch, simply gate behind a define instead.

Core/System.cpp

@@ -385,12 +385,18 @@ bool PSP_InitStart(const CoreParameter &coreParam, std::string *error_string) {
 		return false;
 	}
 
-#if defined(_WIN32) && defined(_M_X64)
+#ifdef GOLD
-	INFO_LOG(BOOT, "PPSSPP %s Windows 64 bit", PPSSPP_GIT_VERSION);
+	const char *gold = " Gold";
-#elif defined(_WIN32) && !defined(_M_X64)
-	INFO_LOG(BOOT, "PPSSPP %s Windows 32 bit", PPSSPP_GIT_VERSION);
 #else
-	INFO_LOG(BOOT, "PPSSPP %s", PPSSPP_GIT_VERSION);
+	const char *gold = "";
+#endif
+
+#if defined(_WIN32) && defined(_M_X64)
+	INFO_LOG(BOOT, "PPSSPP%s %s Windows 64 bit", gold, PPSSPP_GIT_VERSION);
+#elif defined(_WIN32) && !defined(_M_X64)
+	INFO_LOG(BOOT, "PPSSPP%s %s Windows 32 bit", gold, PPSSPP_GIT_VERSION);
+#else
+	INFO_LOG(BOOT, "PPSSPP%s %s", gold, PPSSPP_GIT_VERSION);
 #endif
 
 	GraphicsContext *temp = coreParameter.graphicsContext;

UI/MiscScreens.cpp

@@ -85,11 +85,7 @@ void DrawBackground(UIContext &dc, float alpha = 1.0f) {
 		last_yres = yres;
 	}
 	
-#ifdef GOLD
-	int img = I_BG_GOLD;
-#else
 	int img = I_BG;
-#endif
 
 	uint32_t bgColor = whiteAlpha(alpha);
 	ui_draw2d.DrawImageStretch(img, dc.GetBounds(), bgColor);
@@ -675,7 +671,11 @@ void CreditsScreen::render() {
 
 	// TODO: This is kinda ugly, done on every frame...
 	char temp[256];
+#ifdef GOLD
+	snprintf(temp, sizeof(temp), "PPSSPP Gold %s", PPSSPP_GIT_VERSION);
+#else
 	snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION);
+#endif
 	credits[0] = (const char *)temp;
 
 	UIContext &dc = *screenManager()->getUIContext();

UI/NativeApp.cpp

@@ -576,15 +576,6 @@ void NativeInitGraphics(GraphicsContext *graphicsContext) {
 
 	ui_theme.popupTitle.fgColor = 0xFFE3BE59;
 
-#ifdef GOLD
-	ui_theme.itemFocusedStyle.background = UI::Drawable(0xFF4cc2ed);
-	ui_theme.itemDownStyle.background = UI::Drawable(0xFF39a9ee);
-	ui_theme.itemDisabledStyle.background = UI::Drawable(0x55AFD4E0);
-	ui_theme.itemHighlightedStyle.background = UI::Drawable(0x5539BBbd);
-
-	ui_theme.popupTitle.fgColor = 0xFF59BEE3;
-#endif
-
 	uiTexture = CreateTextureFromFile(g_draw, "ui_atlas.zim", ImageFileType::ZIM);
 	if (!uiTexture) {
 		PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");

Windows/PPSSPP.vcxproj

@@ -228,6 +228,9 @@
       <Command>../Windows/git-version-gen.cmd</Command>
       <Message>Updating git-version.cpp</Message>
     </PreBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -269,6 +272,9 @@
       <Command>../Windows/git-version-gen.cmd</Command>
       <Message>Updating git-version.cpp</Message>
     </PreBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\android\jni\app-android.cpp">
@@ -510,7 +516,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="aboutbox.rc" />
-    <ResourceCompile Include="ppsspp.rc" />
+    <ResourceCompile Include="ppsspp.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
     <None Include="version.rc" />
   </ItemGroup>
   <ItemGroup>
@@ -542,6 +551,9 @@
   <ItemGroup>
     <None Include="PPSSPP.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="ppsspp_gold.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Windows/PPSSPP.vcxproj.filters

@@ -458,4 +458,9 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="ppsspp_gold.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
 </Project>

Windows/ppsspp.rc

@@ -371,7 +371,12 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
+
+#ifdef GOLD
+IDI_PPSSPP              ICON                    "ppsspp_gold.ico"
+#else
 IDI_PPSSPP              ICON                    "ppsspp.ico"
+#endif
 IDI_STOP                ICON                    "icon1.ico"
 IDI_STOPDISABLE         ICON                    "stop1.ico"