aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVoyager1 <voyager@xbmc.org>2014-11-23 12:50:36 +0100
committerVoyager1 <voyager@xbmc.org>2014-11-23 12:50:36 +0100
commitc4a2d57b5ed616518438ac879d77f6f3d314fe59 (patch)
treeca8d495d604ee061f4af8d4dde5599d81a87fa02
parent2a9f21e0f24a08b708a54051842f29bba5e3c205 (diff)
[WIP][rebrand][osx] dynamically create VolumeIcon.icns and move packaging related artwork to the central folder for this (reverted from commit 2a9f21e0f24a08b708a54051842f29bba5e3c205)
-rwxr-xr-xtools/darwin/Support/copyframeworks-osx.command3
-rw-r--r--tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128px.pngbin16289 -> 0 bytes
-rw-r--r--tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16px.pngbin860 -> 0 bytes
-rw-r--r--tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32px.pngbin2389 -> 0 bytes
-rw-r--r--tools/darwin/packaging/osx/VolumeIcon.icnsbin0 -> 219878 bytes
-rw-r--r--tools/darwin/packaging/osx/background/DiskImageBackground.png (renamed from tools/darwin/packaging/media/osx/background/DiskImageBackground.png)bin14687 -> 14687 bytes
-rw-r--r--tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png (renamed from tools/darwin/packaging/media/osx/background/DiskImageBackgroundDebug.png)bin14687 -> 14687 bytes
7 files changed, 1 insertions, 2 deletions
diff --git a/tools/darwin/Support/copyframeworks-osx.command b/tools/darwin/Support/copyframeworks-osx.command
index 7cda004911..df041c1ab1 100755
--- a/tools/darwin/Support/copyframeworks-osx.command
+++ b/tools/darwin/Support/copyframeworks-osx.command
@@ -67,9 +67,8 @@ mkdir -p "$TARGET_CONTENTS/Libraries"
echo "Package $TARGET_BUILD_DIR/$APP_NAME"
cp -f "$TARGET_BUILD_DIR/$APP_NAME" "$TARGET_BINARY"
-echo "Creating icons"
+echo "Creating icon"
iconutil -c icns --output "$TARGET_CONTENTS/Resources/kodi.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset"
-iconutil -c icns --output "$TARGET_CONTENTS/Resources/VolumeIcon.icns" "$SRCROOT/tools/darwin/packaging/media/osx/volumeIcon.iconset"
cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/"
diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128px.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128px.png
deleted file mode 100644
index 55bc265251..0000000000
--- a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128px.png
+++ /dev/null
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16px.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16px.png
deleted file mode 100644
index 474d28ae8f..0000000000
--- a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16px.png
+++ /dev/null
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32px.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32px.png
deleted file mode 100644
index 92d07300c3..0000000000
--- a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32px.png
+++ /dev/null
Binary files differ
diff --git a/tools/darwin/packaging/osx/VolumeIcon.icns b/tools/darwin/packaging/osx/VolumeIcon.icns
new file mode 100644
index 0000000000..75215701b6
--- /dev/null
+++ b/tools/darwin/packaging/osx/VolumeIcon.icns
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/background/DiskImageBackground.png b/tools/darwin/packaging/osx/background/DiskImageBackground.png
index 0508c71c31..0508c71c31 100644
--- a/tools/darwin/packaging/media/osx/background/DiskImageBackground.png
+++ b/tools/darwin/packaging/osx/background/DiskImageBackground.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/background/DiskImageBackgroundDebug.png b/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png
index 0508c71c31..0508c71c31 100644
--- a/tools/darwin/packaging/media/osx/background/DiskImageBackgroundDebug.png
+++ b/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png
Binary files differ