From 61d5fb7032eec80c818a47a390a1e0e298384e89 Mon Sep 17 00:00:00 2001
From: ISSOtm <me@eldred.fr>
Date: Tue, 13 Aug 2024 19:29:48 +0200
Subject: [PATCH] Ignore time-consuming flags for the "dummy publish"

This should speed up builds
---
 makefile | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/makefile b/makefile
index f53b7a2f7..eb2825896 100644
--- a/makefile
+++ b/makefile
@@ -187,12 +187,19 @@ endif
 
 all: ui
 
+# Why do we `dotnet publish` twice?
+# Well, Mesen2 wants to be entirely self-contained, *but* it depends on two native libraries
+# (`libSkiaSharp` and `libHarfBuzzSharp`). It wants to embark those libraries in its `Dependencies.zip`
+# which gets unpacked on startup.
+# So, Mesen2 needs `Dependencies.zip` to contain both libraries before being build itself.
+# BUT, msbuild only copies the libraries to `$(OUTFOLDER)` *after* building Mesen2!
+# So, we need to build once to get the libs (but the flags there don't matter, it's a dummy build after all)
+# and *then* build for real.
 ui: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB)
 	mkdir -p $(OUTFOLDER)/Dependencies
 	rm -fr $(OUTFOLDER)/Dependencies/*
 	cp InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) $(OUTFOLDER)/$(SHAREDLIB)
-	#Called twice because the first call copies native libraries to the bin folder which need to be included in Dependencies.zip
-	cd UI && dotnet publish -c $(BUILD_TYPE) $(OPTIMIZEUI) $(PUBLISHFLAGS)
+	cd UI && dotnet publish -c $(BUILD_TYPE) $(OPTIMIZEUI) -r $(MESENPLATFORM)
 	cd UI && dotnet publish -c $(BUILD_TYPE) $(OPTIMIZEUI) $(PUBLISHFLAGS)
 
 core: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB)
@@ -223,11 +230,12 @@ run:
 	$(OUTFOLDER)/$(MESENPLATFORM)/publish/Mesen
 
 clean:
-	rm -r -f $(COREOBJ)
-	rm -r -f $(UTILOBJ)
-	rm -r -f $(LINUXOBJ) $(LIBEVDEVOBJ)
-	rm -r -f $(SDLOBJ)
-	rm -r -f $(SEVENZIPOBJ)
-	rm -r -f $(LUAOBJ)
-	rm -r -f $(MACOSOBJ)
-	rm -r -f $(DLLOBJ)
+	rm -rf bin
+	rm -rf $(COREOBJ)
+	rm -rf $(UTILOBJ)
+	rm -rf $(LINUXOBJ) $(LIBEVDEVOBJ)
+	rm -rf $(SDLOBJ)
+	rm -rf $(SEVENZIPOBJ)
+	rm -rf $(LUAOBJ)
+	rm -rf $(MACOSOBJ)
+	rm -rf $(DLLOBJ)