Updated build instructions for macOS and Homebrew.

Author: travisgoodspeed

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+# X86 is no longer supported, but you could edit this to bring it back.
+# set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "" FORCE)
 
 project(maskromtool VERSION 0.1 LANGUAGES CXX)
 

README.md

@@ -129,8 +129,7 @@ libreadline-dev qt6-declarative-dev
 ...
 % cd maskromtool
 % git submodule init
-...
-% git submodule update
+% git submodule update --remote
 ...
 % mkdir build; cd build
 % cmake ..
@@ -152,6 +151,31 @@ On macOS, you might need to run 'xattr -dr com.apple.quarantine *` if
 you get warnings about the signature not being recognized.
 
 
+To install on macOS, first install XCode, [Homebrew](https://brew.sh),
+and [Qt for Open Source](https://www.qt.io/download-qt-installer-oss),
+which sadly requires an account.  After that, you can open
+`CMakeLists.txt` in QT Creator or use the release script to build.
+(Edit the script if its Qt version is older than yours.)
+
+```
+% ./buildrelease-macos.sh
+... (ignore errors about signing
+% open release/maskromtool.app
+```
+
+You can also build it without the official Qt installer or App,
+through Homebrew alone.  This is roughly like what we'd do in Linux.
+
+```
+% brew install cmake emacs qt
+% git submodule init
+% git submodule update --remote
+...
+% mkdir build; cd build
+% cmake ..
+% make -j 8 && sudo make install
+```
+
 ## GUI Usage
 
 First use File/Open ROM to open a ROM image as a photograph.  Try to

buildrelease-macos.sh

@@ -3,24 +3,25 @@ set -e
 
 
 ## This is the script that builds release bundles for macOS, leaving
-## the result in release/ in .app and .zip formats.  It does not cross
-## compile or make Universal binaries, so I run it on both ARM64 and
-## AMD64 macs.  I also don't sign the executables, which is a problem.
+## the result in release/ in .app and .zip formats.  This used to be
+## universal, but now I only build for arm64 because x86_64 macs are
+## so old.
 
 
 ## These paths are hardcoded to prevent Homebrew for gunking things
 ## up.  Be sure to install *everything* in that version of Qt, or
 ## you'll be missing important libraries like QtCharts.
-export QTDIR=~/Qt/6.9.0/macos/bin
-export CMAKE=~/Qt/6.9.0/macos/bin/qt-cmake
-export DEPLOYQT=~/Qt/6.9.0/macos/bin/macdeployqt
+export QTDIR=~/Qt/6.9.2/macos/bin
+export CMAKE=~/Qt/6.9.2/macos/bin/qt-cmake
+export DEPLOYQT=~/Qt/6.9.2/macos/bin/macdeployqt
 
 
 
 ## Remove the old releases.
 rm -rf build release
 
 ## We screwed up the 2024-06-23 release on macOS/x86_64 by forgetting to pull, so always do that.
+git submodule init
 git submodule update --remote
 git pull
 
@@ -39,7 +40,7 @@ $DEPLOYQT release/maskromtool.app -dmg -sign-for-notarization="Developer ID Appl
 codesign --verify --verbose  release/maskromtool.app
 
 # Zip up a release.
-(cd release && zip -r maskromtool-macos-universal.zip maskromtool.app gatorom goodasm)
+(cd release && zip -r maskromtool-macos-arm64.zip maskromtool.app gatorom goodasm)
 
 
 echo "See release/ for the release files."

buildrelease.bat

@@ -5,11 +5,12 @@ rmdir /s /q Release
 
 REM Don't forget to pull the new release.
 git pull
-git submodule update
+git submodule init
+git submodule update --remote
 
 
 REM Import the Qt and VS2022 paths.
-set PATH=C:\Qt\Tools\CMake_64\bin;C:\Qt\6.9.0\msvc2022_64\bin;%PATH%
+set PATH=C:\Qt\Tools\CMake_64\bin;C:\Qt\6.9.2\msvc2022_64\bin;%PATH%
 REM "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"
 call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsMSBuildCmd"
 
@@ -36,22 +37,22 @@ copy extern\goodasm\Release\goodasm.exe ..\Release\
 cd ..
 
 REM Adding files that windeployqt forgets.
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Charts.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6OpenGL.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6OpenGLWidgets.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Widgets.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Gui.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6PrintSupport.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Pdf.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Svg.dll Release\
-rem copy C:\Qt\6.9.0\msvc2022_64\bin\Qt6Core.dll Release\
-copy C:\Qt\6.9.0\msvc2022_64\bin\*.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Charts.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6OpenGL.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6OpenGLWidgets.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Widgets.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Gui.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6PrintSupport.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Pdf.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Svg.dll Release\
+rem copy C:\Qt\6.9.2\msvc2022_64\bin\Qt6Core.dll Release\
+copy C:\Qt\6.9.2\msvc2022_64\bin\*.dll Release\
 
 echo Finishing packing Release.  Now making installer.
 
 
 REM Including the path.
-set PATH=C:\Qt\Tools\QtInstallerFramework\4.8\bin;C:\Qt\Tools\CMake_64\bin;C:\Qt\6.9.0\msvc2022_64\bin;C:\Qt\Tools\QtInstallerFramework\4.8\bin;%PATH%
+set PATH=C:\Qt\Tools\QtInstallerFramework\4.8\bin;C:\Qt\Tools\CMake_64\bin;C:\Qt\6.9.2\msvc2022_64\bin;C:\Qt\Tools\QtInstallerFramework\4.8\bin;%PATH%
 
 REM Copying packages.
 xcopy/y/s Release\* Deployment\packages\com.maskromtool.maskromtool\data\