From c8be2494e9b5b0268f9a7191caaa9b3f71082658 Mon Sep 17 00:00:00 2001
From: Eilionoir Tunnicliff <me@crystall1ne.software>
Date: Fri, 2 Sep 2022 23:39:15 -0400
Subject: [PATCH] Java kit fixes in Makefile, added to .gitignore

---
 .gitignore | 3 +++
 Makefile   | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b6e1b109..f5360437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@
 /Natives/build
 .DS_Store
 /pojavlauncher.xcodeproj
+/depends
+/Natives/resources/AppIcon60x60@2x.png
+/Natives/resources/AppIcon76x76@2x~ipad.png
diff --git a/Makefile b/Makefile
index d47363ae..91a59c36 100644
--- a/Makefile
+++ b/Makefile
@@ -324,25 +324,26 @@ dsym: deb
 
 ipa: dsym
 	echo 'Building PojavLauncher $(VERSION) - IPA - Start'
-	mkdir -p $(SOURCEDIR)/depends; \
+		@mkdir -p $(SOURCEDIR)/depends; \
 	cd $(SOURCEDIR)/depends; \
 	if [ ! -f "java-8-openjdk/bin/java" ] && [ ! -f "$(ls ../jre8-*.tar.xz)" ]; then \
 		if [ "$(RUNNER)" != "1" ]; then \
-			wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz'; \
+			wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz' -q --show-progress; \
 		fi; \
 		mkdir java-8-openjdk && cd java-8-openjdk; \
 		tar xvf ../jre8-*.tar.xz; \
 		rm ../jre8-*.tar.xz; \
 	fi; \
-	cd ..; \
+	cd $(SOURCEDIR)/depends; \
 	if [ ! -f "java-17-openjdk/bin/java" ] && [ ! -f "$(ls ../jre17-*.tar.xz)" ]; then \
 		if [ "$(RUNNER)" != "1" ]; then \
-			wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz'; \
+			wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz' -q --show-progress; \
 		fi; \
 		mkdir java-17-openjdk && cd java-17-openjdk; \
 		tar xvf ../jre17-*.tar.xz; \
 		rm ../jre17-*.tar.xz; \
 	fi; \
+	cd ..; \
 	mkdir -p $(OUTPUTDIR); \
 	cd $(OUTPUTDIR); \
 	$(call DIRCHECK,$(OUTPUTDIR)/Payload); \