X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=DEVELOP.md;h=c89fe160147994aa1d525ce06da05e9a86169bb3;hp=7058938ddc018cd0f69e82bcaace8550d3aeb747;hb=HEAD;hpb=94bbba64c270c9365e7ecb7a00fc40f04f203421

diff --git a/DEVELOP.md b/DEVELOP.md
index 7058938dd..51b63ff5c 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -4,6 +4,16 @@ This file collects a few notes relevant to DCP-o-matic developers.  There is als
 [on the web site](https://dcpomatic.com/development).
 
 
+## Building on macOS/arm64
+
+Build `osx-environment` in `$HOME`
+```
+bash platform/osx/copy_resources.sh
+source platform/osx/set_paths.sh
+./waf configure --target-macos-arm64
+```
+
+
 ## Disk writer logging
 
 As we have no `film' folder to log to during disk writes, the logs end up:
@@ -11,7 +21,7 @@ As we have no `film' folder to log to during disk writes, the logs end up:
 ### macOS
 
 * Disk writer backend: `/var/log/dcpomatic_disk_writer_{out,err}.log`
-* Disk writer frontend: `/Users/$USER/Library/Preferences/2/com.dcpomatic/2.16/disk.log`
+* Disk writer frontend: `/Users/$USER/Library/Preferences/com.dcpomatic/2/2.16/disk.log`
 
 ### Windows
 
@@ -29,7 +39,7 @@ As we have no `film' folder to log to during disk writes, the logs end up:
 The main dcpomatic repo has the following branches:
 
 * `main` - the main development branch; contains 2.16.x versions
-* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main`
+* `v2.17.x` - development branch for v2.17.x versions; `main` is merged into this branch.
 
 The `test/data` submodule has the following branches: