aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Marshall <jmarshall@xbmc.org>2014-04-27 09:42:56 +0200
committerda-anda <da-anda@xbmc.org>2014-05-02 00:52:45 +0200
commitb6ac360122dcb7e128c6c45a391ac06070e012f1 (patch)
treed70a611fcab978d66ae9e90e724fc9e4d4e2dc68
parent871bfe6f7378cb94a7c95c6ab7cf03896d17c3af (diff)
[osx] new icons + create icon from the iconset
-rw-r--r--media/xbmc.icnsbin242359 -> 0 bytes
-rwxr-xr-xtools/darwin/Support/copyframeworks-osx.command5
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.pngbin0 -> 8856 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.pngbin0 -> 21747 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.pngbin0 -> 686 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.pngbin0 -> 745 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.pngbin0 -> 27662 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.pngbin0 -> 76539 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.pngbin0 -> 2328 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.pngbin0 -> 3772 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.pngbin0 -> 76539 bytes
-rw-r--r--tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.pngbin0 -> 206499 bytes
12 files changed, 4 insertions, 1 deletions
diff --git a/media/xbmc.icns b/media/xbmc.icns
deleted file mode 100644
index 701df7b03c..0000000000
--- a/media/xbmc.icns
+++ /dev/null
Binary files differ
diff --git a/tools/darwin/Support/copyframeworks-osx.command b/tools/darwin/Support/copyframeworks-osx.command
index 3cafadb6f2..1635c5640d 100755
--- a/tools/darwin/Support/copyframeworks-osx.command
+++ b/tools/darwin/Support/copyframeworks-osx.command
@@ -66,7 +66,10 @@ mkdir -p "$TARGET_CONTENTS/Frameworks"
echo "Package $TARGET_BUILD_DIR/XBMC"
cp -f "$TARGET_BUILD_DIR/XBMC" "$TARGET_BINARY"
-cp -f "$SRCROOT/media/xbmc.icns" "$TARGET_CONTENTS/Resources/"
+
+echo "Creating icon"
+iconutil -c icns --output "$TARGET_CONTENTS/Resources/xbmc.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset"
+
cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/"
# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png
new file mode 100644
index 0000000000..baa9a6e239
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png
new file mode 100644
index 0000000000..280fd6fe3c
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png
new file mode 100644
index 0000000000..6df79830e0
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png
new file mode 100644
index 0000000000..745c260946
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png
new file mode 100644
index 0000000000..5cc7e2d32b
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png
new file mode 100644
index 0000000000..8ffb8b8527
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png
new file mode 100644
index 0000000000..4a16472a7c
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png
new file mode 100644
index 0000000000..097e8f9baa
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png
new file mode 100644
index 0000000000..8ffb8b8527
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png
Binary files differ
diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png
new file mode 100644
index 0000000000..0501cac248
--- /dev/null
+++ b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png
Binary files differ