shithub: choc

Download patch

ref: e0102b88a11b9a4cb13f7aef6be7660e02e9700c
parent: c01e1d2a515fb01542b2a6814a86913a153ff3f0
author: Simon Howard <fraggle@soulsphere.org>
date: Thu Jun 16 19:36:50 EDT 2022 

Add new wadfile icon and generate wadfile.icns.

For consistency we move the image up into the data/ directory so that
it can live next to the other icons. But we can generate the .icns file
the same way we did with app.icns.


--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,7 @@
         setup.ico        \
         setup8.ico       \
         setup.png        \
+        wadfile.png      \
         convert-icon
 
 iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
binary files /dev/null b/data/wadfile.png differ
--- a/pkg/osx/.gitignore
+++ b/pkg/osx/.gitignore
@@ -1,6 +1,8 @@
 Info.plist
 app.iconset
 app.icns
+wadfile.iconset
+wadfile.icns
 launcher
 *.o
 *.d
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -37,13 +37,13 @@
 APP_DOC_DIR=$(APP_BIN_DIR)/Documentation
 APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR))
 
-$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns
+$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns wadfile.icns
 	rm -rf $(STAGING_DIR)
 	mkdir $(STAGING_DIR)
 
 	mkdir -p "$(APP_TOP_DIR)"
 	cp -R Resources "$(APP_TOP_DIR)"
-	cp app.icns "$(APP_TOP_DIR)/Resources"
+	cp app.icns wadfile.icns "$(APP_TOP_DIR)/Resources"
 	cp $(TOPLEVEL)/data/doom.png "$(APP_TOP_DIR)/Resources/128x128.png"
 	cp PkgInfo "$(APP_TOP_DIR)"
 	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)"
@@ -90,14 +90,18 @@
 
 app.icns: $(TOPLEVEL)/data/doom.png
 	mkdir app.iconset
-	sips -z 64 64 $(TOPLEVEL)/data/doom.png \
-	     --out app.iconset/icon_32x32@2x.png
+	sips -z 64 64 $< --out app.iconset/icon_32x32@2x.png
 	iconutil -c icns app.iconset
 
+wadfile.icns: $(TOPLEVEL)/data/wadfile.png
+	mkdir wadfile.iconset
+	sips -z 64 64 $< --out wadfile.iconset/icon_32x32@2x.png
+	iconutil -c icns wadfile.iconset
+
 clean : launcher_clean
 	rm -f $(DMG)
 	rm -rf $(STAGING_DIR)
-	rm -rf app.icns app.iconset
+	rm -rf app.icns app.iconset wadfile.icns wadfile.iconset
 
 # Launcher build:
 CFLAGS = -Wall -I$(TOPLEVEL)
binary files a/pkg/osx/Resources/wadfile.icns /dev/null differ
binary files a/pkg/osx/Resources/wadfile.png /dev/null differ