From 8a70b8ea3ed445f67cc29388327635953da0d900 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Thu, 19 Oct 2023 19:47:55 +0000 Subject: [PATCH] Trying to bring the APK size down again. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4549 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7ba135d4..8fe8f238 100644 --- a/Makefile +++ b/Makefile @@ -582,7 +582,7 @@ $(1): $(BUILD_DIR)/$(1)/$(PROJECT)$(if $(filter win%,$(1)),.exe) $(BUILD_DIR)/$(1)/$(PROJECT)$(if $(filter win%,$(1)),.exe): $(filter $(BUILD_DIR)/$(1)/%,$(ALL_APP_OBJS)) @echo [link] $$@ - @$$(CC) -o $$@ $$^ $$(LDFLAGS) + @$$(CC) $$(LDFLAGS) -o $$@ $$^ $(BUILD_DIR)/$(1)/%.o: %.c @mkdir -p $$(dir $$@) @@ -647,7 +647,7 @@ PACKAGE_DIRS := \ deps/codemirror/ \ deps/lit/ -RAW_FILES := $(shell find $(PACKAGE_DIRS) -type f) +RAW_FILES := $(filter-out apps/gg% apps/welcome%, $(shell find $(PACKAGE_DIRS) -type f)) out/apk/TildeFriends-debug.unsigned.apk: BUILD_TYPE := debug out/apk/TildeFriends-release.unsigned.apk: BUILD_TYPE := release @@ -669,7 +669,7 @@ out/%.unsigned.apk: @cp out/apk/res.apk $@ @cp out/apk/classes.dex out/apk$(BUILD_TYPE)/ @cd out/apk$(BUILD_TYPE) && zip -u ../../$@ -q -9 -r . && cd ../../ - @zip -u $@ -q -9 -x '*.map' -r $(PACKAGE_DIRS) $(RAW_FILES) + @zip -u $@ -q -9 -x '*.map' --exclude=apps/gg* --exclude=apps/welcome* -r $(PACKAGE_DIRS) $(RAW_FILES) out/%.apk: out/apk/%.unsigned.apk @echo [apksigner] $(notdir $@) @@ -734,7 +734,7 @@ clean: rm -rf $(BUILD_DIR) .PHONY: clean -dist: apk +dist: apk iosrelease-ipa @echo "[export] $$(svn info --show-item url)" @rm -rf tildefriends-$(VERSION_NUMBER) @svn export -q . tildefriends-$(VERSION_NUMBER) @@ -742,6 +742,7 @@ dist: apk @echo "[tar] tildefriends-$(VERSION_NUMBER).tar.xz" @tar \ --exclude=apps/gg* \ + --exclude=apps/welcome* \ --exclude=deps/libbacktrace/Isaac.Newton-Opticks.txt \ --exclude=deps/libsodium/builds/msvc/vs* \ --exclude=deps/libsodium/builds/msvc/build \ @@ -759,6 +760,8 @@ dist: apk @rm -rf tildefriends-$(VERSION_NUMBER) @echo "[cp] TildeFriends-$(VERSION_NUMBER).apk" @cp out/TildeFriends-release.apk TildeFriends-$(VERSION_NUMBER).apk + @echo "[cp] TildeFriends-$(VERSION_NUMBER).ipa" + @cp out/tildefriends-release.ipa TildeFriends-$(VERSION_NUMBER).ipa .PHONY: dist dist-test: dist