Merge pull request #225 from jss2a98aj/cherry-pick-98622

Cherry-pick build status-dependent icons
blazium-engine · Jan 12, 2025 · 668a001 · 668a001
2 parents 71cb8ee + a00a723
commit 668a001
Show file tree

Hide file tree

Showing 178 changed files with 446 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -89,6 +89,11 @@ project.properties
 platform/android/java/*/.cxx/
 platform/android/java/*/build/
 platform/android/java/*/libs/
+platform/android/java/lib/res/mipmap/
+platform/android/java/lib/res/mipmap-*dpi/
+
+# Macos
+misc/dist/macos_tools.app/Contents/Resources/Blazium.icns
 
 # iOS
 *.dSYM

diff --git a/main/SCsub b/main/SCsub
@@ -31,10 +31,11 @@ if env_main.editor_build and not env_main["no_editor_splash"]:
         env.Run(main_builders.make_splash_editor),
     )
 
-env_main.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
+icon_png_path = "#main/icons/app_icon_" + env.version_info["external_status"] + ".png"
+env_main.Depends("#main/app_icon.gen.h", icon_png_path)
 env_main.CommandNoCache(
     "#main/app_icon.gen.h",
-    "#main/app_icon.png",
+    icon_png_path,
     env.Run(main_builders.make_app_icon),
 )
 

diff --git a/main/app_icon.png b/main/app_icon.png
diff --git a/main/icons/app_icon_dev.png b/main/icons/app_icon_dev.png
diff --git a/main/icons/app_icon_nightly.png b/main/icons/app_icon_nightly.png
diff --git a/main/icons/app_icon_pr.png b/main/icons/app_icon_pr.png
diff --git a/main/icons/app_icon_release.png b/main/icons/app_icon_release.png
diff --git a/misc/dist/icon_badges/status_dev.svg b/misc/dist/icon_badges/status_dev.svg
diff --git a/misc/dist/icon_badges/status_dev_mini.svg b/misc/dist/icon_badges/status_dev_mini.svg
diff --git a/misc/dist/icon_badges/status_nightly.svg b/misc/dist/icon_badges/status_nightly.svg
diff --git a/misc/dist/icon_badges/status_nightly_mini.svg b/misc/dist/icon_badges/status_nightly_mini.svg
diff --git a/misc/dist/icon_badges/status_pr.svg b/misc/dist/icon_badges/status_pr.svg
diff --git a/misc/dist/icon_badges/status_pr_mini.svg b/misc/dist/icon_badges/status_pr_mini.svg
diff --git a/misc/dist/icon_console.svg b/misc/dist/icon_console.svg
diff --git a/misc/dist/icon_generation/icon_badges/console.svg b/misc/dist/icon_generation/icon_badges/console.svg