aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2023-09-05 02:31:05 +0200
committerTeddy Wing2023-09-05 02:34:14 +0200
commit1c0b5ce56df6e6cd2d27179dc3e6b26bdb3061ef (patch)
tree9e1fffd43fba968d0915334bd5b3b1d70c4624ea
parentf8675ee766d8947099716290a7c0e3eafb421916 (diff)
downloadBase-Windowed-Application-1c0b5ce56df6e6cd2d27179dc3e6b26bdb3061ef.tar.bz2
Makefile: Remove errors when APP_NAME has no spaces
Add some conditionals to remove the targets that rename the bundle the application name has spaces in it. This fixes the warnings and circular dependency problems we had when building an application bundle with no spaces where `APP_NAME` and `APP_NAME_NOSPACE` are the same. The rules and organisation definitely need to be cleaned up, but the idea works. We should eliminate one of these conditions and put all the related rules together under a single `ifneq`.
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ce49cc1..09bb98e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ $(PRODUCT): $(OBJECTS) | build
build:
mkdir -p build
+ifneq ($(APP_NAME),$(APP_NAME_NOSPACE))
# build/$(APP_NAME).app: build/$(APP_NAME_NOSPACE).app
# cp -R $< "${@}"
build/$(APP_NAME).app: $(NOSPACE_BUNDLE_FILES)
@@ -47,6 +48,7 @@ build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE)
# build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME): \
# build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE)
# mv $< "${@}"
+endif
build/$(APP_NAME_NOSPACE).app: | build
mkdir -p build/$(APP_NAME_NOSPACE).app
@@ -88,6 +90,13 @@ Internationalization/%.lproj \
| build/$(APP_NAME_NOSPACE).app/Contents/Resources
cp -R $< "${@}"
+ifeq ($(APP_NAME),$(APP_NAME_NOSPACE))
+.PHONY: app
+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))
+else
.PHONY: app
app: \
build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE) \
@@ -97,6 +106,7 @@ build/$(APP_NAME).app \
build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME)
# $(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LOCALIZABLE_STRINGS))
+endif
.PHONY: genstrings