Commit Graph

13 Commits

Author SHA1 Message Date
Dom Rodriguez
fca18b63c5
Merge branch 'master' into testing/pr/Absolucy/macos
This merges #1162 into Barrier.

Thanks!

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-10-31 21:00:26 +00:00
a1346054
486545527b
Fix shellcheck warnings 2021-09-22 22:58:15 +00:00
Lucy
a4afb983d1
Merge branch 'master' into master 2021-06-23 21:59:59 -04:00
Tomoya Tanjo
e80184ce7a
Fix osx_environment.sh for Homebrew 2021-06-22 23:24:36 +09:00
aspen
615762d7b3
Fix compilation on M1 macOS 2021-05-13 11:41:29 -04:00
Adrian Lucrèce Céleste
70a4ece9e8
Revert "Tidy up and fix lint errors in build scripts" 2019-08-22 17:03:18 -04:00
Dom Rodriguez
452820eef7
Interim fix for failed macOS builds
Not ideal, but it might just work. Take two!

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2019-08-20 18:29:17 +01:00
Dom Rodriguez
c685f0f231
Tidy up and fix lint errors in build scripts
I've tidied up the code in both of the build scripts used for *nix-like
systems, and the macOS/OSX specific build script helper.

This has been tested on Linux with no issues, but this PR will hopefully
indicate if the changes run without issues on macOS as well.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2019-08-20 18:08:03 +01:00
Girts Folkmanis
b6861a7d3c add checks to osx_environment.sh
Check if Xcode and required packages are installed, otherwise fail
early.
2019-01-05 11:19:28 -08:00
Povilas Kanapickas
b8fa610f8f Build full installer via clean_build.sh (#157)
* OSX: Fix lack of newlines in build messages

* OSX: Build full installer as part of the installer build via cmake
2018-10-19 13:17:04 -04:00
Povilas Kanapickas
5467b90982 OSX: Prefer Macports over Homebrew if available 2018-07-02 22:33:42 +03:00
Povilas Kanapickas
f928c81afc OSX: Add support for building on macports 2018-07-02 22:33:21 +03:00
walker0643
f07070f7f9 fix OSX build 2018-02-13 14:49:39 -05:00