From 507f71c9449ef08f5f95a1d8698c7a9ed5dce805 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 17 Aug 2024 20:09:23 +1000
Subject: [PATCH] macOS: Build app bundle with makefile

---
 Makefile                                 |  51 ++++++++++++++---------
 misc/macOS/{CCIcon.icns => appicon.icns} | Bin
 misc/macOS/info.plist                    |   4 +-
 3 files changed, 33 insertions(+), 22 deletions(-)
 rename misc/macOS/{CCIcon.icns => appicon.icns} (100%)

diff --git a/Makefile b/Makefile
index a192f6633..c7c2ceb78 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ ifeq ($(PLAT),darwin)
 	LIBS    =
 	LDFLAGS =  -rdynamic -framework Cocoa -framework OpenGL -framework IOKit -lobjc
 	BUILD_DIR = build-macos
+	TARGET  = $(ENAME).app
 endif
 
 ifeq ($(PLAT),freebsd)
@@ -159,41 +160,41 @@ endif
 default: $(PLAT)
 
 web:
-	$(MAKE) $(ENAME) PLAT=web
+	$(MAKE) $(TARGET) PLAT=web
 linux:
-	$(MAKE) $(ENAME) PLAT=linux
+	$(MAKE) $(TARGET) PLAT=linux
 mingw:
-	$(MAKE) $(ENAME) PLAT=mingw
+	$(MAKE) $(TARGET) PLAT=mingw
 sunos:
-	$(MAKE) $(ENAME) PLAT=sunos
+	$(MAKE) $(TARGET) PLAT=sunos
 darwin:
-	$(MAKE) $(ENAME) PLAT=darwin
+	$(MAKE) $(TARGET) PLAT=darwin
 freebsd:
-	$(MAKE) $(ENAME) PLAT=freebsd
+	$(MAKE) $(TARGET) PLAT=freebsd
 openbsd:
-	$(MAKE) $(ENAME) PLAT=openbsd
+	$(MAKE) $(TARGET) PLAT=openbsd
 netbsd:
-	$(MAKE) $(ENAME) PLAT=netbsd
+	$(MAKE) $(TARGET) PLAT=netbsd
 dragonfly:
-	$(MAKE) $(ENAME) PLAT=dragonfly
+	$(MAKE) $(TARGET) PLAT=dragonfly
 haiku:
-	$(MAKE) $(ENAME) PLAT=haiku
+	$(MAKE) $(TARGET) PLAT=haiku
 beos:
-	$(MAKE) $(ENAME) PLAT=beos
+	$(MAKE) $(TARGET) PLAT=beos
 serenityos:
-	$(MAKE) $(ENAME) PLAT=serenityos
+	$(MAKE) $(TARGET) PLAT=serenityos
 irix:
-	$(MAKE) $(ENAME) PLAT=irix
+	$(MAKE) $(TARGET) PLAT=irix
 
 # Default overrides
 sdl2:
-	$(MAKE) $(ENAME) SDL2=1
+	$(MAKE) $(TARGET) SDL2=1
 sdl3:
-	$(MAKE) $(ENAME) SDL3=1
+	$(MAKE) $(TARGET) SDL3=1
 terminal:
-	$(MAKE) $(ENAME) TERMINAL=1
+	$(MAKE) $(TARGET) TERMINAL=1
 release:
-	$(MAKE) $(ENAME) RELEASE=1
+	$(MAKE) $(TARGET) RELEASE=1
 
 # Some builds require more complex handling, so are moved to
 #  separate makefiles to avoid having one giant messy makefile
@@ -240,11 +241,21 @@ macclassic_ppc:
 clean:
 	$(RM) $(OBJECTS)
 
-
-$(ENAME): $(BUILD_DIR) $(OBJECTS)
-	$(CC) $(LDFLAGS) -o $@$(OEXT) $(OBJECTS) $(EXTRA_LIBS) $(LIBS)
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
+$(ENAME): $(BUILD_DIR) $(OBJECTS)
+	$(CC) $(LDFLAGS) -o $@$(OEXT) $(OBJECTS) $(EXTRA_LIBS) $(LIBS)
+
+
+# macOS app bundle
+$(ENAME).app : $(ENAME)
+	mkdir $(TARGET)
+	mkdir $(TARGET)/Contents
+	mkdir $(TARGET)/Contents/MacOS
+	mkdir $(TARGET)/Contents/Resources
+	cp $(ENAME) $(TARGET)/Contents/MacOS/$(ENAME)
+	cp misc/macOS/Info.plist   $(TARGET)/Contents/Resources/Info.plist
+	cp misc/macOS/appicon.icns $(TARGET)/Contents/Resources/appicon.icns
 
 
 # === Compiling with dependency tracking ===
diff --git a/misc/macOS/CCIcon.icns b/misc/macOS/appicon.icns
similarity index 100%
rename from misc/macOS/CCIcon.icns
rename to misc/macOS/appicon.icns
diff --git a/misc/macOS/info.plist b/misc/macOS/info.plist
index 41123d13d..21fe5b85d 100644
--- a/misc/macOS/info.plist
+++ b/misc/macOS/info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleExecutable</key>
 	<string>ClassiCube</string>
 	<key>CFBundleIconFile</key>
-	<string>ClassiCube</string>
+	<string>appicon</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.classicube.client.mac</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,4 +17,4 @@
 	<key>CFBundleDisplayName</key>
 	<string>ClassiCube</string>
 </dict>
-</plist>
\ No newline at end of file
+</plist>