Merge branch 'master' into merge-v4.0.0

This commit is contained in:
Matt Borgerson 2019-07-04 00:59:25 -07:00
commit 0550699026
2 changed files with 3 additions and 0 deletions

View file

@ -44,6 +44,7 @@ addons:
- libsdl2-dev
- libepoxy-dev
homebrew:
update: true
packages:
- glib
- pixman

View file

@ -48,6 +48,8 @@ case "$(uname -s)" in # adjust compilation option based on platform
echo 'Compiling for MacOS…'
sys_cflags='-march=native'
sys_opts='--disable-cocoa'
# necessary to find libffi, which is required by gobject
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}/usr/local/opt/libffi/lib/pkgconfig"
;;
CYGWIN*|MINGW*|MSYS*)
echo 'Compiling for Windows…'