Skip to content

Commit fcb5b48

Browse files
author
Michael Zahniser
committed
Reorganized the icons so the .iconset only contains the files that Mac OS X expects.
1 parent 5ad034b commit fcb5b48

20 files changed

+3
-3
lines changed

EndlessSky.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
A90C15DB1D5BD56800708F3A /* Rectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rectangle.h; path = source/Rectangle.h; sourceTree = "<group>"; };
182182
A93931FA1988135200C2A87B /* libturbojpeg.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libturbojpeg.0.dylib; path = "/opt/libjpeg-turbo/lib/libturbojpeg.0.dylib"; sourceTree = "<absolute>"; };
183183
A93931FC1988136B00C2A87B /* libpng14.14.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng14.14.dylib; path = /usr/local/lib/libpng14.14.dylib; sourceTree = "<absolute>"; };
184-
A94408A41982F3E600610427 /* endless-sky.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = "endless-sky.iconset"; sourceTree = "<group>"; };
184+
A94408A41982F3E600610427 /* endless-sky.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = "endless-sky.iconset"; path = "icons/endless-sky.iconset"; sourceTree = "<group>"; };
185185
A966A5A91B964E6300DFF69C /* Person.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Person.cpp; path = source/Person.cpp; sourceTree = "<group>"; };
186186
A966A5AA1B964E6300DFF69C /* Person.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Person.h; path = source/Person.h; sourceTree = "<group>"; };
187187
A96862CD1AE6FD0A004FE1FE /* Account.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Account.cpp; path = source/Account.cpp; sourceTree = "<group>"; };

SConstruct

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ icons = []
8181
for size in sizes:
8282
destination = "$DESTDIR$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png"
8383
icons.append(destination)
84-
env.InstallAs(destination, "endless-sky.iconset/icon_" + size + ".png")
84+
env.InstallAs(destination, icons/icon_" + size + ".png")
8585

8686
# If any of those icons changed, also update the cache.
8787
# Do not update the cache if we're not installing into "usr".
File renamed without changes.

icons/icon_16x16.png

560 Bytes
Loading
File renamed without changes.
File renamed without changes.

icons/icon_256x256.png

76 KB
Loading

icons/icon_32x32.png

1.5 KB
Loading
File renamed without changes.

source/WinApp.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
AppIcon ICON "../endless-sky.iconset/WinApp.ico"
1+
AppIcon ICON "../icons/WinApp.ico"

0 commit comments

Comments
 (0)