aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--backends/maweb.md4
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 305dc61..9f2034c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,6 +164,9 @@ install:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl; fi
+# OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment...
+ - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include"
+ - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; export CXX="ccache g++-8"; fi
diff --git a/backends/maweb.md b/backends/maweb.md
index fe430db..f3b40b6 100644
--- a/backends/maweb.md
+++ b/backends/maweb.md
@@ -53,8 +53,8 @@ Currently, three types of MA controls can be assigned, with each having some sub
* B-Wing 2 has 316 to 309 (top row) through 816 to 809 (bottom row)
When creating a new show, only the first page is created and active. Additional pages have to be created explicitly within
-the console before being usable. `fader` controls, when mapped as outputs from the MA, output their value, `button` controls
-output 1 when the corresponding executor is running, 0 otherwise.
+the console before being usable. When mapped as outputs, `fader` controls output their value, `button` controls output 1 when the corresponding
+executor is running, 0 otherwise.
These controls can be addressed like