From d5bd24b66ce300dfed61070a60fd8faffc28a762 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Mon, 4 Sep 2023 00:31:37 +0200 Subject: Makefile: Move space-less version to a .app bundle with spaces This gets us the dependencies set up so they can use paths without spaces, but creates a .app bundle with spaces as a final product. It does so by moving the files where we substituted spaces with a non-space character to file names with spaces. I don't like this yet because `make app` builds a whole new binary and everything else, but the resulting bundle is what we want. --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7625392..881d785 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,12 @@ $(PRODUCT): $(OBJECTS) | build build: mkdir -p build -# TODO: No space version. -# build/$(APP_NAME).app: | build -# mkdir -p build/$(APP_NAME).app +build/$(APP_NAME).app: build/$(APP_NAME_NOSPACE).app + mv $< "${@}" + +build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME): \ +build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE) + mv $< "${@}" build/$(APP_NAME_NOSPACE).app: | build mkdir -p build/$(APP_NAME_NOSPACE).app @@ -81,7 +84,9 @@ Internationalization/%.lproj \ app: \ build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE) \ build/$(APP_NAME_NOSPACE).app/Contents/Info.plist \ -$(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LPROJS)) +$(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LPROJS)) \ +build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME) \ +build/$(APP_NAME).app # $(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LOCALIZABLE_STRINGS)) -- cgit v1.2.3