diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh index e37cda69ad96a6755e8fc3d658a4b264c6f0fd64..5e82c0e23328960078490d7b70fa26b1df8e53dd 100755 --- a/ci/travis/before_install.sh +++ b/ci/travis/before_install.sh @@ -1,6 +1,5 @@ brew update -brew install wget brew install libsodium ## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8) brew install qt5 @@ -32,7 +31,7 @@ wget http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1. tar xzf PyQt-gpl-5.5.1.tar.gz cd PyQt-gpl-5.5.1/ pyenv activate sakia-env -python configure.py --verbose +python configure.py --verbose --confirm-license make && make install pyenv rehash diff --git a/setup.py b/setup.py index fb1a7ce11c195b5125da87d1240bb194798de24e..817731597b785014a543bfbd29006678e0d89970 100644 --- a/setup.py +++ b/setup.py @@ -53,8 +53,6 @@ if sys.platform == "win32": includefiles.append((os.path.join(path, "Scripts", "plugins", "iconengines", f), os.path.join("iconengines", f) )) includefiles.append(libEGL_path) includefiles.append(libsodium_path) -elif sys.platform == "darwin": - pass else: libsodium_path = "" print(QtCore.QCoreApplication.libraryPaths())