commit e0102b88a11b9a4cb13f7aef6be7660e02e9700c
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Thu Jun 16 23:36:50 2022 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Thu Jun 16 23:53:03 2022 -0400
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.
---
data/Makefile.am | 1 +
data/wadfile.png | Bin 0 -> 8681 bytes
pkg/osx/.gitignore | 2 ++
pkg/osx/GNUmakefile | 14 +++++++++-----
pkg/osx/Resources/wadfile.icns | Bin 44092 -> 0 bytes
pkg/osx/Resources/wadfile.png | Bin 2249 -> 0 bytes
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index ebbc3fe8..9d13ada9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST= \
setup.ico \
setup8.ico \
setup.png \
+ wadfile.png \
convert-icon
iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
diff --git a/data/wadfile.png b/data/wadfile.png
new file mode 100644
index 00000000..a5888438
Binary files /dev/null and b/data/wadfile.png differ
diff --git a/pkg/osx/.gitignore b/pkg/osx/.gitignore
index 2cc92237..a2b2f72d 100644
--- 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
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 5c3447c1..7911bffe 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -37,13 +37,13 @@ SRC_INFO_PLIST=Info.plist
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 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns
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)
diff --git a/pkg/osx/Resources/wadfile.icns b/pkg/osx/Resources/wadfile.icns
deleted file mode 100644
index 13502a55..00000000
Binary files a/pkg/osx/Resources/wadfile.icns and /dev/null differ
diff --git a/pkg/osx/Resources/wadfile.png b/pkg/osx/Resources/wadfile.png
deleted file mode 100644
index 394a3e33..00000000
Binary files a/pkg/osx/Resources/wadfile.png and /dev/null differ