Merge branch 'v2' of github.com:VCVRack/Rack-private into v2

.gitignore

@@ -7,7 +7,6 @@
 *.res
 *.d
 *.dSYM
-*.vcvplugin
 
 /Rack
 /dep

arch.mk

@@ -1,11 +1,8 @@
 MACHINE = $(shell $(CC) -dumpmachine)
 
 ifneq (,$(findstring x86_64-,$(MACHINE)))
-	ARCH_x64 := 1
+	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

compile.mk

@@ -21,6 +21,10 @@ FLAGS += -Wall -Wextra -Wno-unused-parameter
 CXXFLAGS += -std=c++11
 
 # Architecture-independent flags
+ifdef ARCH_X64
+	FLAGS += -DARCH_X64
+endif
+
 ifdef ARCH_LIN
 	FLAGS += -DARCH_LIN
 	CXXFLAGS += -Wsuggest-override

include/common.hpp

@@ -259,6 +259,7 @@ extern const std::string APP_EDITION_NAME;
 extern const std::string APP_VERSION_MAJOR;
 extern const std::string APP_VERSION;
 extern const std::string APP_OS;
+extern const std::string APP_ARCH;
 extern const std::string API_URL;
 
 

src/common.cpp

@@ -27,6 +27,9 @@ const std::string APP_VERSION = TOSTRING(_APP_VERSION);
 #elif defined ARCH_LIN
 	const std::string APP_OS = "lin";
 #endif
+#if defined ARCH_X64
+	const std::string APP_ARCH = "x64";
+#endif
 const std::string API_URL = "https://api.vcvrack.com";