Update Makefile and README to build x86_64 on M1 Mac

Author: hsource

.idea/.gitignore

@@ -52,28 +52,36 @@ pob: load_pob luacurl frontend
 	popd
 
 frontend: 
-	meson -Dbuildtype=release --prefix=${DIR}/PathOfBuilding.app --bindir=Contents/MacOS build
+	arch=x86_64 meson -Dbuildtype=release --prefix=${DIR}/PathOfBuilding.app --bindir=Contents/MacOS build
 
 load_pob:
 	git clone https://github.com/PathOfBuildingCommunity/PathOfBuilding.git; \
 	pushd PathOfBuilding; \
 	git add . && git fetch && git reset --hard origin/dev; \
 	popd
 
-# The sed below ensures that we only replace `lua` with `luajit` once
+# The seds below ensure that:
+#
+# - we only replace `lua` with `luajit` once
+# - we use pkg-config to find the right path for curl libraries
+# - we use gcc-12 from Homebrew instead of clang, to ensure that we build
+#   the x86_64 library on ARM systems
+# - we target only MacOS 10.5 or later; otherwise, we get an error
 luacurl:
 	git clone --depth 1 https://github.com/Lua-cURL/Lua-cURLv3.git; \
 	pushd Lua-cURLv3; \
 	sed -i '' 's/\?= lua$$/\?= luajit/' Makefile; \
-	sed -i '' 's@shell .* --libs libcurl@shell PKG_CONFIG_PATH=\$$\$$(brew --prefix --installed curl)/lib/pkgconfig \$$(PKG_CONFIG) --libs libcurl@' Makefile; \
+	sed -i '' 's@shell .* --libs libcurl@shell PKG_CONFIG_PATH=\$$\$$(arch --x86_64 brew --prefix --installed curl)/lib/pkgconfig \$$(PKG_CONFIG) --libs libcurl@' Makefile; \
+    sed -i '' 's@?= \$$(MAC_ENV) gcc$$@ = \$$(MAC_ENV) arch=x86_64 gcc-12@' Makefile; \
+    sed -i '' "s@MACOSX_DEPLOYMENT_TARGET='10.3'@MACOSX_DEPLOYMENT_TARGET='10.5'@" Makefile; \
 	make; \
 	mv lcurl.so ../lcurl.so; \
 	popd
 
 # curl is used since mesonInstaller.sh copies over the shared library dylib
 # dylibbundler is used to copy over dylibs that lcurl.so uses
 tools:
-	brew install qt@5 luajit zlib meson curl dylibbundler
+	arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc
 
 # We don't usually modify the PathOfBuilding directory, so there's rarely a
 # need to delete it. We separate it out to a separate task.

.idea/modules.xml

@@ -6,13 +6,26 @@ A cross-platform [Path of Building](https://github.com/Openarl/PathOfBuilding) d
 Building
 --------
 
-### Steps to build
+### Steps to build an x86_64 binary on M1 Macs
+
+Before starting, you need to install Homebrew for x86_64.
+
+1. Install Rosetta if you haven't via `softwareupdate --install-rosetta`
+2. Run the [Homebrew installation command](https://docs.brew.sh/Installation),
+   but prepend `arch --x86_64`. The command will be `arch --x86_64 bash -c ...`
+3. Create a `~/.intelbrew` file with these contents:
+   ```sh
+   eval "$(/usr/local/bin/brew shellenv)"
+   alias brew='arch --x86_64 /usr/local/bin/brew'
+   ```
+4. Include it to update your environment variables by running `. ~/.intelbrew`
 
 ```sh
 # Run this only once after installing Homebrew to install dependencies
 make tools
 
 # Build the entire app
+export PATH="/usr/local/opt/qt@5/bin:$PATH"
 make
 
 # Optionally sign it for distribution