projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple of macOS development notes.
[dcpomatic.git]
/
DEVELOP.md
diff --git
a/DEVELOP.md
b/DEVELOP.md
index 3ba1eeac2e16942b4af83b02f8ef0fb9eac5f16a..51b63ff5c3382ff56b0a75edabf09b8b6c5e8648 100644
(file)
--- 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).
[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:
## Disk writer logging
As we have no `film' folder to log to during disk writes, the logs end up:
@@
-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
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:
The `test/data` submodule has the following branches: