Refactor arch.mk.

Makefile

@@ -142,7 +142,7 @@ ifdef ARCH_WIN
 endif
 
 DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt
-DIST_NAME := Rack-$(EDITION)-"$(VERSION)"-$(ARCH)
+DIST_NAME := Rack-$(EDITION)-"$(VERSION)"-$(ARCH_OS_NAME)
 DIST_SDK_DIR := Rack-SDK
 DIST_SDK := Rack-SDK-$(VERSION).zip
 ifdef ARCH_MAC
@@ -236,7 +236,7 @@ endif
 notarize:
 ifdef ARCH_MAC
 	# This will only work if you have my Apple ID password in your keychain
-	xcrun altool --notarize-app -f dist/"$(DIST_BUNDLE)"-"$(VERSION)"-$(ARCH).zip --primary-bundle-id=com.vcvrack.rack -u "andrewpbelt@gmail.com" -p @keychain:notarize --output-format xml > dist/UploadInfo.plist
+	xcrun altool --notarize-app -f dist/"$(DIST_BUNDLE)"-"$(VERSION)"-$(ARCH_OS_NAME).zip --primary-bundle-id=com.vcvrack.rack -u "andrewpbelt@gmail.com" -p @keychain:notarize --output-format xml > dist/UploadInfo.plist
 	# Wait for Apple's servers to approve the app
 	while true; do \
 		echo "Waiting on Apple servers..." ; \

arch.mk

@@ -1,20 +1,24 @@
 MACHINE = $(shell $(CC) -dumpmachine)
-ifneq (, $(findstring apple, $(MACHINE)))
+
+ifneq (,$(findstring x86_64-,$(MACHINE)))
+	ARCH_x64 := 1
+	ARCH_NAME := x64
+else ifneq (,$(findstring i686-,$(MACHINE)))
+	ARCH_x86 := 1
+	ARCH_NAME := x86
+else
+$(error Could not determine CPU architecture of $(MACHINE). Try hacking around in arch.mk)
+endif
+
+ifneq (,$(findstring -darwin,$(MACHINE)))
 	ARCH_MAC := 1
-	ARCH := mac
-else ifneq (, $(findstring mingw, $(MACHINE)))
+	ARCH_OS_NAME := mac
+else ifneq (,$(findstring -mingw32,$(MACHINE)))
 	ARCH_WIN := 1
-	ARCH := win
-	ifneq ( ,$(findstring x86_64, $(MACHINE)))
-		ARCH_WIN_64 := 1
-		BITS := 64
-	else ifneq (, $(findstring i686, $(MACHINE)))
-		ARCH_WIN_32 := 1
-		BITS := 32
-	endif
-else ifneq (, $(findstring linux, $(MACHINE)))
+	ARCH_OS_NAME := win
+else ifneq (,$(findstring -linux,$(MACHINE)))
 	ARCH_LIN := 1
-	ARCH := lin
+	ARCH_OS_NAME := lin
 else
-$(error Could not determine architecture of $(MACHINE). Try hacking around in arch.mk)
+$(error Could not determine OS of $(MACHINE). Try hacking around in arch.mk)
 endif

plugin.mk

@@ -79,7 +79,7 @@ else
 	cp -r --parents $(DISTRIBUTABLES) dist/$(SLUG)/
 endif
 	@# Create ZIP package
-	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH).vcvplugin
+	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH_OS_NAME).vcvplugin
 
 install: dist
 	mkdir -p "$(RACK_USER_DIR)"/plugins/