Work around imagemagick regression that puts everything upside down

[xonotic/xonotic.git] / misc / tools / rebrand-darkplaces-engine.sh

diff --git a/misc/tools/rebrand-darkplaces-engine.sh b/misc/tools/rebrand-darkplaces-engine.sh
index 0e911bb37ecf750b2f0160e9d8c0faf854827bc4..105e58cdac10300ebbf93f6dee50bddf1dfa2105 100755 (executable)
--- a/misc/tools/rebrand-darkplaces-engine.sh
+++ b/misc/tools/rebrand-darkplaces-engine.sh
@@ -56,7 +56,13 @@ for EXECUTABLE in "$@"; do
                        esac
                        ;;
                *PE*)
-                       uses_ico=true
+                       case "$EXECUTABLE" in
+                               *-dedicated.exe)
+                                       ;;
+                               *)
+                                       uses_ico=true
+                                       ;;
+                       esac
                        ;;
        esac
 
@@ -67,7 +73,7 @@ for EXECUTABLE in "$@"; do
                cp "$icon_xpm" "$t/darkplaces-icon.xpm"
                cnt=
                for i in $icons_tga; do
-                       convert "$i" "$t/darkplaces-icon$cnt.tga"
+                       convert "$i" -auto-orient "$t/darkplaces-icon$cnt.tga"
                        if [ -z "$cnt" ]; then
                                cnt=2
                        else