Merge branch 'master' into lexelby-no-embroider-command

1 files changed, 11 insertions, 0 deletions

diff --git a/bin/build-dist b/bin/build-dist
index 79c89838..a96b7506 100755
--- a/bin/build-dist
+++ b/bin/build-dist
@@ -22,6 +22,12 @@ pyinstaller_args+="--hidden-import gi.repository.Gtk "
 # mac and windows build seem to miss wx import
 pyinstaller_args+="--hidden-import wx "
 
+# We need to use the precompiled bootloader linked with graphical Mac OS X
+# libraries if we develop a GUI application for Mac:
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    pyinstaller_args+="--windowed "
+fi
+
 # This lets pyinstaller see inkex.py, etc.
 pyinstaller_args+="-p inkscape-0.92.3/share/extensions "
 
@@ -45,6 +51,11 @@ mkdir dist/bin
 mv dist/inkstitch/* dist/bin
 mv dist/bin dist/inkstitch
 
+# on Mac, pyinstaller creates a .app version as well, but we don't need that
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    rm -rf dist/inkstitch.app/
+fi
+
 # Inkscape doesn't let us run native binaries as extensions(?!).  Instead we
 # add this stub script which executes the binary that pyinstaller creates.
 cp stub.py dist/inkstitch.py